From 25a7ca9a60a20fa9e8f7d482e13d7bb5b205af09 Mon Sep 17 00:00:00 2001 From: poire-z Date: Thu, 23 Mar 2023 18:37:40 +0100 Subject: [PATCH] ButtonTable: allow shrinking unneeded width If buttons and their text would fit in a smaller width, reduce the whole ButtonTable width. May be used for properly sized context menus with ButtonDialog, with the width required depending on the translations for a language. --- frontend/ui/widget/button.lua | 16 ++++++++++ frontend/ui/widget/buttondialog.lua | 4 +++ frontend/ui/widget/buttontable.lua | 47 ++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/frontend/ui/widget/button.lua b/frontend/ui/widget/button.lua index 753259307..287f62c88 100644 --- a/frontend/ui/widget/button.lua +++ b/frontend/ui/widget/button.lua @@ -85,6 +85,12 @@ function Button:init() local outer_pad_width = 2*self.padding_h + 2*self.margin + 2*self.bordersize -- unscaled_size_check: ignore + -- If this button could be made smaller while still not needing truncation + -- or a smaller font size, we'll set this: it may allow an upper widget to + -- resize/relayout itself to look more compact/nicer (as this size would + -- depends on translations) + self._min_needed_width = nil + if self.text then local max_width = self.max_width or self.width if max_width then @@ -97,6 +103,9 @@ function Button:init() bold = self.text_font_bold, face = Font:getFace(self.text_font_face, self.text_font_size) } + if not self.label_widget:isTruncated() then + self._min_needed_width = self.label_widget:getSize().w + outer_pad_width + end self.did_truncation_tweaks = false if self.avoid_text_truncation and self.label_widget:isTruncated() then self.did_truncation_tweaks = true @@ -146,6 +155,7 @@ function Button:init() width = self.icon_width, height = self.icon_height, } + self._min_needed_width = self.icon_width + outer_pad_width end local widget_size = self.label_widget:getSize() local inner_width @@ -212,6 +222,12 @@ function Button:init() } end +function Button:getMinNeededWidth() + if self._min_needed_width and self._min_needed_width < self.width then + return self._min_needed_width + end +end + function Button:setText(text, width) if text ~= self.text then -- Don't trash the frame if we're already a text button, and we're keeping the geometry intact diff --git a/frontend/ui/widget/buttondialog.lua b/frontend/ui/widget/buttondialog.lua index 7266e2b36..524e3cb78 100644 --- a/frontend/ui/widget/buttondialog.lua +++ b/frontend/ui/widget/buttondialog.lua @@ -57,6 +57,8 @@ local ButtonDialog = InputContainer:extend{ buttons = nil, width = nil, width_factor = nil, -- number between 0 and 1, factor to the smallest of screen width and height + shrink_unneeded_width = false, -- have 'width' meaning 'max_width' + shrink_min_width = nil, -- default to ButtonTable's default tap_close_callback = nil, alpha = nil, -- passed to MovableContainer } @@ -90,6 +92,8 @@ function ButtonDialog:init() ButtonTable:new{ buttons = self.buttons, width = self.width - 2*Size.border.window - 2*Size.padding.button, + shrink_unneeded_width = self.shrink_unneeded_width, + shrink_min_width = self.shrink_min_width, show_parent = self, }, background = Blitbuffer.COLOR_WHITE, diff --git a/frontend/ui/widget/buttontable.lua b/frontend/ui/widget/buttontable.lua index 8cc21089d..08b285046 100644 --- a/frontend/ui/widget/buttontable.lua +++ b/frontend/ui/widget/buttontable.lua @@ -12,6 +12,14 @@ local Screen = Device.screen local ButtonTable = FocusManager:extend{ width = nil, + -- If requested, allow ButtonTable to shrink itself if 'width' can + -- be reduced without any truncation or font size getting smaller. + shrink_unneeded_width = false, + -- But we won't go below this: buttons are tapable, we want some + -- minimal width so they are easy to tap (this is mostly needed + -- for CJK languages where button text can be one or two glyphs). + shrink_min_width = Screen:scaleBySize(100), + buttons = { { {text="OK", enabled=true, callback=nil}, @@ -27,7 +35,7 @@ function ButtonTable:init() self.buttons_layout = {} self.button_by_id = {} self.container = VerticalGroup:new{ width = self.width } - table.insert(self, self.container) + self[1] = self.container if self.zero_sep then -- If we're asked to add a first line, don't add a vspan before: caller -- must do its own padding before. @@ -37,6 +45,7 @@ function ButtonTable:init() self:addHorizontalSep(false, false, true) end local row_cnt = #self.buttons + local table_min_needed_width = -1 for i = 1, row_cnt do local buttons_layout_line = {} local horizontal_group = HorizontalGroup:new{} @@ -53,6 +62,7 @@ function ButtonTable:init() end end local default_button_width = math.floor(available_width / unspecified_width_buttons) + local min_needed_button_width = -1 for j = 1, column_cnt do local btn_entry = row[j] local button = Button:new{ @@ -84,6 +94,21 @@ function ButtonTable:init() text_font_bold = btn_entry.font_bold, show_parent = self.show_parent, } + if self.shrink_unneeded_width and not btn_entry.width and min_needed_button_width ~= false then + -- We gather the largest min width of all buttons without a specified width, + -- and will see how it does when this largest min width is applied to all + -- buttons (without a specified width): we still want to keep them the same + -- size and balanced. + local min_width = button:getMinNeededWidth() + if min_width then + if min_needed_button_width < min_width then + min_needed_button_width = min_width + end + else + -- If any one button in this row can't be made smaller, give up + min_needed_button_width = false + end + end if btn_entry.id then self.button_by_id[btn_entry.id] = button end @@ -109,6 +134,19 @@ function ButtonTable:init() -- Only add lines that are not separator to the focusmanager table.insert(self.buttons_layout, buttons_layout_line) end + if self.shrink_unneeded_width and table_min_needed_width ~= false then + if min_needed_button_width then + if min_needed_button_width >= 0 and min_needed_button_width < default_button_width then + local row_min_width = self.width - (default_button_width - min_needed_button_width)*unspecified_width_buttons + if table_min_needed_width < row_min_width then + table_min_needed_width = row_min_width + end + end + else + -- If any one row can't be made smaller, give up + table_min_needed_width = false + end + end end -- end for each button line self:addHorizontalSep(true, false, false) if Device:hasDPad() then @@ -117,6 +155,13 @@ function ButtonTable:init() else self.key_events = {} -- deregister all key press event listeners end + if self.shrink_unneeded_width and table_min_needed_width ~= false + and table_min_needed_width > 0 and table_min_needed_width < self.width then + self.width = table_min_needed_width > self.shrink_min_width and table_min_needed_width or self.shrink_min_width + self.shrink_unneeded_width = false + self:free() + self:init() + end end function ButtonTable:addHorizontalSep(vspan_before, add_line, vspan_after, black_line)