X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75738bb65b5db3f5d3106e6fad78c7a4a07f993b..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 31f2503850..f964661d2e 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -582,25 +582,20 @@ bool wxSizerItem::IsShown() const return m_window->IsShown(); case Item_Sizer: + { // arbitrarily decide that if at least one of our elements is // shown, so are we (this arbitrariness is the reason for // deprecating this function) + for ( wxSizerItemList::compatibility_iterator + node = m_sizer->GetChildren().GetFirst(); + node; + node = node->GetNext() ) { - // Some apps (such as dialog editors) depend on an empty sizer still - // being laid out correctly and reporting the correct size and position. - if (m_sizer->GetChildren().GetCount() == 0) + if ( node->GetData()->IsShown() ) return true; - - for ( wxSizerItemList::compatibility_iterator - node = m_sizer->GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - if ( node->GetData()->IsShown() ) - return true; - } } return false; + } case Item_Spacer: return m_spacer->IsShown(); @@ -845,6 +840,10 @@ bool wxSizer::Replace( size_t old, wxSizerItem *newitem ) wxSizerItem *item = node->GetData(); node->SetData(newitem); + + if (item->IsWindow() && item->GetWindow()) + item->GetWindow()->SetContainingSizer(NULL); + delete item; return true; @@ -910,6 +909,11 @@ wxSize wxSizer::ComputeFittingClientSize(wxWindow *window) sizeMax = wxDisplay(disp).GetClientArea().GetSize(); + // If determining the display size failed, skip the max size checks as + // we really don't want to create windows of (0, 0) size. + if ( !sizeMax.x || !sizeMax.y ) + return size; + // space for decorations and toolbars etc. sizeMax = tlw->WindowToClientSize(sizeMax); } @@ -1324,6 +1328,7 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) m_vgap( vgap ), m_hgap( hgap ) { + wxASSERT(cols >= 0); } wxGridSizer::wxGridSizer( int cols, const wxSize& gap ) @@ -1332,6 +1337,7 @@ wxGridSizer::wxGridSizer( int cols, const wxSize& gap ) m_vgap( gap.GetHeight() ), m_hgap( gap.GetWidth() ) { + wxASSERT(cols >= 0); } wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) @@ -1340,6 +1346,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) m_vgap( vgap ), m_hgap( hgap ) { + wxASSERT(rows >= 0 && cols >= 0); } wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap ) @@ -1348,6 +1355,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap ) m_vgap( gap.GetHeight() ), m_hgap( gap.GetWidth() ) { + wxASSERT(rows >= 0 && cols >= 0); } wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item) @@ -2090,7 +2098,7 @@ void wxBoxSizer::RecalcSizes() // Check for the degenerated case when we don't have enough space for even // the min sizes of all the items: in this case we really can't do much - // more than to to allocate the min size to as many of fixed size items as + // more than to allocate the min size to as many of fixed size items as // possible (on the assumption that variable size items such as text zones // or list boxes may use scrollbars to show their content even if their // size is less than min size but that fixed size items such as buttons @@ -2300,7 +2308,12 @@ wxSize wxBoxSizer::CalcMin() m_totalProportion = 0; m_minSize = wxSize(0, 0); - // calculate the minimal sizes for all items and count sum of proportions + // The minimal size for the sizer should be big enough to allocate its + // element at least its minimal size but also, and this is the non trivial + // part, to respect the children proportion. To satisfy the latter + // condition we must find the greatest min-size-to-proportion ratio for all + // elements with non-zero proportion. + float maxMinSizeToProp = 0.; for ( wxSizerItemList::const_iterator i = m_children.begin(); i != m_children.end(); ++i ) @@ -2311,13 +2324,31 @@ wxSize wxBoxSizer::CalcMin() continue; const wxSize sizeMinThis = item->CalcMin(); - SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis); + if ( const int propThis = item->GetProportion() ) + { + float minSizeToProp = GetSizeInMajorDir(sizeMinThis); + minSizeToProp /= propThis; + + if ( minSizeToProp > maxMinSizeToProp ) + maxMinSizeToProp = minSizeToProp; + + m_totalProportion += item->GetProportion(); + } + else // fixed size item + { + // Just account for its size directly + SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis); + } + + // In the transversal direction we just need to find the maximum. if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) ) SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis); - - m_totalProportion += item->GetProportion(); } + // Using the max ratio ensures that the min size is big enough for all + // items to have their min size and satisfy the proportions among them. + SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion); + return m_minSize; } @@ -2371,6 +2402,9 @@ void wxStaticBoxSizer::RecalcSizes() // in the wxBoxSizer::RecalcSizes() call below using coordinates relative // to the top-left corner of the staticbox: m_position.x = m_position.y = 0; +#elif defined(__WXOSX__) && wxOSX_USE_COCOA + // the distance from the 'inner' content view to the embedded controls + m_position.x = m_position.y = 10; #else // if the wxStaticBox has childrens, then these windows must be placed // by the wxBoxSizer::RecalcSizes() call below using coordinates relative @@ -2549,30 +2583,38 @@ void wxStdDialogButtonSizer::Realize() // Extra space around and at the right Add(12, 40); #elif defined(__WXGTK20__) - Add(0, 0, 0, wxLEFT, 9); + // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en + // says that the correct button order is + // + // [Help] [Alternative] [Cancel] [Affirmative] + + // Flags ensuring that margins between the buttons are 6 pixels. + const wxSizerFlags + flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3); + + // Margin around the entire sizer button should be 12. + AddSpacer(9); + if (m_buttonHelp) - Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + Add(m_buttonHelp, flagsBtn); - // extra whitespace between help and cancel/ok buttons - Add(0, 0, 1, wxEXPAND, 0); + // Align the rest of the buttons to the right. + AddStretchSpacer(); - if (m_buttonNegative){ - Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); - } + if (m_buttonNegative) + Add(m_buttonNegative, flagsBtn); - // according to HIG, in explicit apply windows the order is: - // [ Help Apply Cancel OK ] if (m_buttonApply) - Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + Add(m_buttonApply, flagsBtn); - if (m_buttonCancel){ - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); - // Cancel or help should be default - // m_buttonCancel->SetDefaultButton(); - } + if (m_buttonCancel) + Add(m_buttonCancel, flagsBtn); if (m_buttonAffirmative) - Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6); + Add(m_buttonAffirmative, flagsBtn); + + // Ensure that the right margin is 12 as well. + AddSpacer(9); #elif defined(__WXMSW__) // Windows