Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ribbon page scroll button not shown on window restore

Browse Source 
See #17453
This commit is contained in:
Paul Cornett
2017-12-03 09:57:12 -08:00
parent 289fbcf5be
commit 91d8082cc9
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ribbon/page.cpp
View File

@@ -1002,7 +1002,6 @@ bool wxRibbonPage::ExpandPanels(wxOrientation direction, int maximum_amount)
bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount) bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
{ {
bool collapsed_something = false;
while(minimum_amount > 0) while(minimum_amount > 0)
{ {
int largest_size = 0; int largest_size = 0;
@@ -1086,7 +1085,6 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
largest_panel_size->y -= amount; largest_panel_size->y -= amount;
} }
minimum_amount -= amount; minimum_amount -= amount;
collapsed_something = true;
} }
else else
{ {
@@ -1094,7 +1092,6 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
wxSize delta = (*largest_panel_size) - smaller; wxSize delta = (*largest_panel_size) - smaller;
*largest_panel_size = smaller; *largest_panel_size = smaller;
minimum_amount -= GetSizeInOrientation(delta, direction); minimum_amount -= GetSizeInOrientation(delta, direction);
collapsed_something = true;
} }
} }
else else
@@ -1102,7 +1099,7 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
break; break;
} }
} }
return collapsed_something; return minimum_amount <= 0;
} }
bool wxRibbonPage::DismissExpandedPanel() bool wxRibbonPage::DismissExpandedPanel()