From 3ade64954c72d1a7ab043216378db43f742e5898 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 16 Feb 2025 14:51:07 +0000 Subject: [PATCH] Change: Restore wider spacers in main toolbars. (#12039) Width for all spacers was included only due to an off-by-one from counting buttons and not excluding the normally hidden switcher button. Spacer width of quarter the button width is now included explicitly, --- src/toolbar_gui.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 5f1688fa5d..4e0e78658b 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1414,7 +1414,13 @@ public: child_wid->current_x = child_wid->smallest_x; } } - _toolbar_width = nbuttons * this->smallest_x; + + /* Exclude the switcher button which is not displayed when the toolbar fits the screen. When the switch is + * displayed there will be no spacers anyway. */ + --nbuttons; + + /* Allow space for all buttons, and include spacers at quarter the width of buttons. */ + _toolbar_width = nbuttons * this->smallest_x + this->spacers * this->smallest_x / 4; } void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override