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

Add possibility to hide panels in wxRibbon.

Browse Source 
Add wxRibbonBar::{Show,Hide}Panels() and ArePanelsShown() accessor.

Also add a toggle button to the sample to test the new functionality
(unfortunately it couldn't be done by a control in the ribbon itself as there
would be no way to show the panels back then).

Closes #12707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-01-06 22:02:07 +00:00
parent 3a194bda7b
commit 3603e5658f
5 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ribbon/bar.cpp
View File

@@ -109,6 +109,14 @@ bool wxRibbonBar::DismissExpandedPanel()
return m_pages.Item(m_current_page).page->DismissExpandedPanel();
}
void wxRibbonBar::ShowPanels(const bool show)
{
m_arePanelsShown = show;
SetMinSize(wxSize(GetSize().GetWidth(), DoGetBestSize().GetHeight()));
Realise();
GetParent()->Layout();
}
void wxRibbonBar::SetWindowStyleFlag(long style)
{
m_flags = style;
@@ -538,6 +546,7 @@ wxRibbonBar::wxRibbonBar()
m_tab_scroll_left_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
m_tab_scroll_right_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
m_tab_scroll_buttons_shown = false;
m_arePanelsShown = true;
}
wxRibbonBar::wxRibbonBar(wxWindow* parent,
@@ -585,6 +594,7 @@ void wxRibbonBar::CommonInit(long style)
m_tab_scroll_left_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
m_tab_scroll_right_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
m_tab_scroll_buttons_shown = false;
m_arePanelsShown = true;
if(m_art == NULL)
{
@@ -946,7 +956,7 @@ void wxRibbonBar::RecalculateMinSize()
}
m_minWidth = min_size.GetWidth();
m_minHeight = min_size.GetHeight();
m_minHeight = m_arePanelsShown ? min_size.GetHeight() : m_tab_height;
}
wxSize wxRibbonBar::DoGetBestSize() const
@@ -964,6 +974,10 @@ wxSize wxRibbonBar::DoGetBestSize() const
{
best.IncBy(0, m_tab_height);
}
if(!m_arePanelsShown)
{
best.SetHeight(m_tab_height);
}
return best;
}