RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:27:35 +00:00
Code Issues Activity Actions

LibGUI: Include overflow button in overflow calculation only when shown

Browse source 
This prevents items from being put in the overflow menu, even though
there is still enough space for all items to be shown, because the
overflow button does not take up space when it is not needed.
This commit is contained in:
FrHun 2022-10-05 22:17:38 +02:00 • committed by Sam Atkins
parent 6330de15b6
commit b868337d5e
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGUI/Toolbar.cpp
View file

@ -181,13 +181,13 @@ ErrorOr<void> Toolbar::update_overflow_menu()
Optional<size_t> marginal_index {}; Optional<size_t> marginal_index {};
auto position { 0 }; auto position { 0 };
auto is_horizontal { m_orientation == Gfx::Orientation::Horizontal }; auto is_horizontal { m_orientation == Gfx::Orientation::Horizontal };
auto margin { is_horizontal ? layout()->margins().right() : layout()->margins().bottom() }; auto margin { is_horizontal ? layout()->margins().horizontal_total() : layout()->margins().vertical_total() };
auto toolbar_size { is_horizontal ? width() : height() }; auto toolbar_size { is_horizontal ? width() : height() };
for (size_t i = 0; i < m_items.size() - 1; ++i) { for (size_t i = 0; i < m_items.size() - 1; ++i) {
auto& item = m_items.at(i); auto& item = m_items.at(i);
auto item_size = is_horizontal ? item.widget->width() : item.widget->height(); auto item_size = is_horizontal ? item.widget->width() : item.widget->height();
if (position + item_size + m_button_size + margin > toolbar_size) { if (position + item_size + margin > toolbar_size) {
marginal_index = i; marginal_index = i;
break; break;
} }
@ -203,6 +203,18 @@ ErrorOr<void> Toolbar::update_overflow_menu()
return {}; return {};
} }
if (marginal_index.value() > 0) {
for (size_t i = marginal_index.value() - 1; i > 0; --i) {
auto& item = m_items.at(i);
auto item_size = is_horizontal ? item.widget->width() : item.widget->height();
if (position + m_button_size + margin <= toolbar_size)
break;
item.widget->set_visible(false);
position -= item_size;
marginal_index = i;
}
}
if (m_grouped) { if (m_grouped) {
for (size_t i = marginal_index.value(); i > 0; --i) { for (size_t i = marginal_index.value(); i > 0; --i) {
auto& item = m_items.at(i); auto& item = m_items.at(i);