dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a29766d: Wrong scrolling dropdown list position with RTL. (#12412)

Browse Source 
(cherry picked from commit 9750826590)
This commit is contained in:
Peter Nelson
2024-04-02 13:29:15 +01:00
committed by Jonathan G Rennison
parent 54093fb8b2
commit 8fdc91bd9f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/dropdown.cpp
View File

@@ -154,7 +154,12 @@ struct DropdownWindow : Window {
this->position.y = button_rect.bottom + 1; this->position.y = button_rect.bottom + 1;
} }
this->position.x = (_current_text_dir == TD_RTL) ? button_rect.right + 1 - (int)widget_dim.width : button_rect.left; if (_current_text_dir == TD_RTL) {
/* In case the list is wider than the parent button, the list should be right aligned to the button and overflow to the left. */
this->position.x = button_rect.right + 1 - (int)(widget_dim.width + (list_dim.height > widget_dim.height ? NWidgetScrollbar::GetVerticalDimension().width : 0));
} else {
this->position.x = button_rect.left;
}
this->items_dim = widget_dim; this->items_dim = widget_dim;
this->GetWidget<NWidgetStacked>(WID_DM_SHOW_SCROLL)->SetDisplayedPlane(list_dim.height > widget_dim.height ? 0 : SZSP_NONE); this->GetWidget<NWidgetStacked>(WID_DM_SHOW_SCROLL)->SetDisplayedPlane(list_dim.height > widget_dim.height ? 0 : SZSP_NONE);