solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Add support for hidden panels in ribbon

Browse source 
If a panel window is hidden, then don't include its size when laying out
the ribbon bar. After toggling a panel's visibility, calling Realize()
and Layout() will properly include the panel (if shown) or not show it
and move panels to the right of it over (without a blank gap in the
ribbon bar where the hidden panel would be).

Closes #24237.
This commit is contained in:
Blake Madden 2024-01-21 12:23:00 -05:00 • committed by Vadim Zeitlin
parent 0c3afbe580
commit 21ae234a37
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ribbon/page.cpp
View file

@ -918,7 +918,7 @@ bool wxRibbonPage::ExpandPanels(wxOrientation direction, int maximum_amount)
node = node->GetNext(), ++panel_size )
{
wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
if(panel == nullptr)
if(panel == nullptr || !panel->IsShown())
{
continue;
}
@ -1018,7 +1018,7 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
node = node->GetNext(), ++panel_size )
{
wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
if(panel == largest_panel)
if(panel == largest_panel && panel->IsShown())
{
largest_panel_size = panel_size;
break;
@ -1033,7 +1033,7 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
node = node->GetNext(), ++panel_size )
{
wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
if(panel == nullptr)
if(panel == nullptr || !panel->IsShown())
{
continue;
}
@ -1109,7 +1109,7 @@ bool wxRibbonPage::DismissExpandedPanel()
node = node->GetNext() )
{
wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
if(panel == nullptr)
if(panel == nullptr || !panel->IsShown())
{
continue;
}

12
src/ribbon/panel.cpp
View file

@ -342,6 +342,10 @@ bool wxRibbonPanel::IsSizingContinuous() const
// Finds the best width and height given the parent's width and height
wxSize wxRibbonPanel::GetBestSizeForParentSize(const wxSize& parentSize) const
{
if (!IsShown())
{
return wxSize(0, 0);
}
if (GetChildren().GetCount() == 1)
{
wxWindow* win = GetChildren().GetFirst()->GetData();
@ -561,6 +565,10 @@ bool wxRibbonPanel::CanAutoMinimise() const
wxSize wxRibbonPanel::GetMinSize() const
{
if (!IsShown())
{
return wxSize(0, 0);
}
if(m_expanded_panel != nullptr)
{
// Minimum size depends upon children, who are currently in the
@ -580,6 +588,10 @@ wxSize wxRibbonPanel::GetMinSize() const
wxSize wxRibbonPanel::GetMinNotMinimisedSize() const
{
if (!IsShown())
{
return wxSize(0, 0);
}
// Ask sizer if present
if(GetSizer())
{