|
@@ -6351,8 +6351,8 @@ laUiList *la_DetectUiListRecursive(laUiList *uil, int x, int y, int LimH,
|
|
|
|
|
|
if (y > LimH) return uil;
|
|
|
|
|
|
- if (/*uil->ScrollerShownV && */ laIsInBound(x, y, uil->R, uil->R+LA_SCROLL_W+4, uil->U, uil->B) ||
|
|
|
- /*uil->ScrollerShownH && */ laIsInBound(x, y, uil->L, uil->R, uil->B, uil->B+LA_SCROLL_W+4)){
|
|
|
+ if ((uil->ScrollerShownV && laIsInBound(x, y, uil->R, uil->R+LA_SCROLL_W+4, uil->U, uil->B)) ||
|
|
|
+ (uil->ScrollerShownH && laIsInBound(x, y, uil->L, uil->R, uil->B, uil->B+LA_SCROLL_W+4))){
|
|
|
if (ScrollUil) *ScrollUil = uil; /* if (ParentUi)*ParentUi = uil;*/
|
|
|
return uil;
|
|
|
}
|
|
@@ -6407,15 +6407,15 @@ laUiList *la_DetectUiListRecursive(laUiList *uil, int x, int y, int LimH,
|
|
|
}
|
|
|
|
|
|
if ((ui->Type == _LA_UI_FIXED_GROUP || ui->Type == _LA_UI_TAB) && (ui->Subs.pFirst || ui->Page)){
|
|
|
- if (ui->Page->HeightCoeff) CPB = ui->B+ui->Page->PanY;
|
|
|
- else CPB = ui->Page->B+ui->Page->PanY;
|
|
|
+ if (ui->Page->HeightCoeff) CPB = ui->B;
|
|
|
+ else CPB = ui->Page->B;
|
|
|
if (ui->Page->ScrollerShownV && laIsInBound(x, y, ui->R - LA_SCROLL_W - bt->RP*2, ui->R, ui->Page->U, CPB)){
|
|
|
if (ScrollUil) *ScrollUil = ui->Page; if (ParentUi) *ParentUi = ui;
|
|
|
}elif (ui->Page->ScrollerShownH && laIsInBound(x, y, ui->Page->L, ui->Page->R, ui->B - LA_SCROLL_W - bt->BP*2, ui->B)){
|
|
|
if (ScrollUil) *ScrollUil = ui->Page; if (ParentUi) *ParentUi = ui;
|
|
|
}elif (laIsInBound(x, y, ui->Page->L, ui->Page->R, ui->Page->U, CPB)){
|
|
|
if (ParentUi) *ParentUi = ui;
|
|
|
- if (tuil = la_DetectUiListRecursive(ui->Page, x, y, CPB, ParentUi, ScrollUil, ContainerParent, InToContainerUI, Exception)) return tuil;
|
|
|
+ if (tuil = la_DetectUiListRecursive(ui->Page, x, y, CPB+ui->Page->PanY, ParentUi, ScrollUil, ContainerParent, InToContainerUI, Exception)) return tuil;
|
|
|
}
|
|
|
}
|
|
|
|