X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/960615f41009ac62e99f833afbec10d96bd2d2f9..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/ribbon/page.cpp diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp index fcca24e37b..0fecb1c0a2 100644 --- a/src/ribbon/page.cpp +++ b/src/ribbon/page.cpp @@ -14,10 +14,9 @@ #pragma hdrstop #endif -#include "wx/ribbon/page.h" - #if wxUSE_RIBBON +#include "wx/ribbon/page.h" #include "wx/ribbon/art.h" #include "wx/ribbon/bar.h" #include "wx/dcbuffer.h" @@ -374,6 +373,8 @@ void wxRibbonPage::SetSizeWithScrollButtonAdjustment(int x, int y, int width, in } } } + if (width < 0) width = 0; + if (height < 0) height = 0; SetSize(x, y, width, height); } @@ -382,7 +383,7 @@ void wxRibbonPage::DoSetSize(int x, int y, int width, int height, int sizeFlags) // When a resize triggers the scroll buttons to become visible, the page is resized. // This resize from within a resize event can cause (MSW) wxWidgets some confusion, // and report the 1st size to the 2nd size event. Hence the most recent size is - // remembered internally and used in Layout() where appropiate. + // remembered internally and used in Layout() where appropriate. if(GetMajorAxis() == wxHORIZONTAL) { @@ -414,9 +415,12 @@ void wxRibbonPage::OnSize(wxSizeEvent& evt) { wxSize new_size = evt.GetSize(); - wxMemoryDC temp_dc; - wxRect invalid_rect = m_art->GetPageBackgroundRedrawArea(temp_dc, this, m_old_size, new_size); - Refresh(true, &invalid_rect); + if (m_art) + { + wxMemoryDC temp_dc; + wxRect invalid_rect = m_art->GetPageBackgroundRedrawArea(temp_dc, this, m_old_size, new_size); + Refresh(true, &invalid_rect); + } m_old_size = new_size; @@ -491,19 +495,30 @@ bool wxRibbonPage::Realize() void wxRibbonPage::PopulateSizeCalcArray(wxSize (wxWindow::*get_size)(void) const) { + wxSize parentSize = GetSize(); + parentSize.x -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE); + parentSize.x -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE); + parentSize.y -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE); + parentSize.y -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE); + if(m_size_calc_array_size != GetChildren().GetCount()) { delete[] m_size_calc_array; m_size_calc_array_size = GetChildren().GetCount(); m_size_calc_array = new wxSize[m_size_calc_array_size]; } + wxSize* node_size = m_size_calc_array; for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext(), ++node_size ) { wxWindow* child = node->GetData(); - *node_size = (child->*get_size)(); + wxRibbonPanel* panel = wxDynamicCast(child, wxRibbonPanel); + if (panel && panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE) + *node_size = panel->GetBestSizeForParentSize(parentSize); + else + *node_size = (child->*get_size)(); } } @@ -539,6 +554,7 @@ bool wxRibbonPage::DoActualLayout() minor_axis_size = GetSize().GetWidth() - origin.x - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE); available_space = m_size_in_major_axis_for_children - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE) - origin.y; } + if (minor_axis_size < 0) minor_axis_size = 0; size_t size_index; for(size_index = 0; size_index < m_size_calc_array_size; ++size_index) { @@ -624,6 +640,8 @@ bool wxRibbonPage::DoActualLayout() ShowScrollButtons(); else if(todo_hide_scroll_buttons) HideScrollButtons(); + else if(m_scroll_buttons_visible) + ShowScrollButtons(); Refresh(); return true; @@ -663,29 +681,33 @@ void wxRibbonPage::ShowScrollButtons() if(show_left) { - if(m_scroll_left_btn == NULL) + wxMemoryDC temp_dc; + wxSize size; + long direction; + if(GetMajorAxis() == wxHORIZONTAL) { - wxMemoryDC temp_dc; - wxSize size; - long direction; - if(GetMajorAxis() == wxHORIZONTAL) - { - direction = wxRIBBON_SCROLL_BTN_LEFT; - size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); - size.SetHeight(GetSize().GetHeight()); - } - else - { - direction = wxRIBBON_SCROLL_BTN_UP; - size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); - size.SetWidth(GetSize().GetWidth()); - } - m_scroll_left_btn = new wxRibbonPageScrollButton(this, wxID_ANY, GetPosition(), size, direction); - if(!IsShown()) - { - m_scroll_left_btn->Hide(); - } - reposition = true; + direction = wxRIBBON_SCROLL_BTN_LEFT; + size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); + size.SetHeight(GetSize().GetHeight()); + } + else + { + direction = wxRIBBON_SCROLL_BTN_UP; + size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); + size.SetWidth(GetSize().GetWidth()); + } + if (m_scroll_left_btn) + { + m_scroll_left_btn->SetSize(size); + } + else + { + m_scroll_left_btn = new wxRibbonPageScrollButton(this, wxID_ANY, GetPosition(), size, direction); + reposition = true; + } + if(!IsShown()) + { + m_scroll_left_btn->Hide(); } } else @@ -700,30 +722,34 @@ void wxRibbonPage::ShowScrollButtons() if(show_right) { - if(m_scroll_right_btn == NULL) + wxMemoryDC temp_dc; + wxSize size; + long direction; + if(GetMajorAxis() == wxHORIZONTAL) { - wxMemoryDC temp_dc; - wxSize size; - long direction; - if(GetMajorAxis() == wxHORIZONTAL) - { - direction = wxRIBBON_SCROLL_BTN_RIGHT; - size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); - size.SetHeight(GetSize().GetHeight()); - } - else - { - direction = wxRIBBON_SCROLL_BTN_DOWN; - size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); - size.SetWidth(GetSize().GetWidth()); - } - wxPoint initial_pos = GetPosition() + GetSize() - size; - m_scroll_right_btn = new wxRibbonPageScrollButton(this, wxID_ANY, initial_pos, size, direction); - if(!IsShown()) - { - m_scroll_right_btn->Hide(); - } - reposition = true; + direction = wxRIBBON_SCROLL_BTN_RIGHT; + size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); + size.SetHeight(GetSize().GetHeight()); + } + else + { + direction = wxRIBBON_SCROLL_BTN_DOWN; + size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); + size.SetWidth(GetSize().GetWidth()); + } + wxPoint initial_pos = GetPosition() + GetSize() - size; + if (m_scroll_right_btn) + { + m_scroll_right_btn->SetSize(size); + } + else + { + m_scroll_right_btn = new wxRibbonPageScrollButton(this, wxID_ANY, initial_pos, size, direction); + reposition = true; + } + if(!IsShown()) + { + m_scroll_right_btn->Hide(); } } else @@ -771,7 +797,12 @@ bool wxRibbonPage::ExpandPanels(wxOrientation direction, int maximum_amount) { continue; } - if(panel->IsSizingContinuous()) + if (panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE) + { + // Don't change if it's flexible since we already calculated the + // correct size for the panel. + } + else if(panel->IsSizingContinuous()) { int size = GetSizeInOrientation(*panel_size, direction); if(size < smallest_size) @@ -1070,4 +1101,9 @@ wxSize wxRibbonPage::DoGetBestSize() const return best; } +void wxRibbonPage::HideIfExpanded() +{ + wxStaticCast(m_parent, wxRibbonBar)->HideIfExpanded(); +} + #endif // wxUSE_RIBBON