X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afba7c46ce2fbd13a6aed64e7600343fd01c224..ba49d2acf95d53517719c4fd9ac2ad5aaa13540b:/src/common/sizer.cpp?ds=inline diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 518ccce91f..bcc5bad25b 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -207,6 +207,33 @@ void wxSizerItem::DoSetSpacer(const wxSize& size) SetRatio(size); } +wxSize wxSizerItem::AddBorderToSize(const wxSize& size) const +{ + wxSize result = size; + + // Notice that we shouldn't modify the unspecified component(s) of the + // size, it's perfectly valid to have either min or max size specified in + // one direction only and it shouldn't be applied in the other one then. + + if ( result.x != wxDefaultCoord ) + { + if (m_flag & wxWEST) + result.x += m_border; + if (m_flag & wxEAST) + result.x += m_border; + } + + if ( result.y != wxDefaultCoord ) + { + if (m_flag & wxNORTH) + result.y += m_border; + if (m_flag & wxSOUTH) + result.y += m_border; + } + + return result; +} + wxSizerItem::wxSizerItem(int width, int height, int proportion, @@ -397,20 +424,13 @@ wxSize wxSizerItem::CalcMin() wxSize wxSizerItem::GetMinSizeWithBorder() const { - wxSize ret = m_minSize; - - if (m_flag & wxWEST) - ret.x += m_border; - if (m_flag & wxEAST) - ret.x += m_border; - if (m_flag & wxNORTH) - ret.y += m_border; - if (m_flag & wxSOUTH) - ret.y += m_border; - - return ret; + return AddBorderToSize(m_minSize); } +wxSize wxSizerItem::GetMaxSizeWithBorder() const +{ + return AddBorderToSize(GetMaxSize()); +} void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ ) { @@ -486,7 +506,7 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ ) // have changed alignment or some other property which would // not change the size of the window. In such a case, no // wxSizeEvent would normally be generated and thus the - // control wouldn't get layed out correctly here. + // control wouldn't get laid out correctly here. #if 1 m_window->SetSize(pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT ); @@ -840,6 +860,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; @@ -905,6 +929,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); } @@ -1319,6 +1348,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 ) @@ -1327,6 +1357,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 ) @@ -1335,6 +1366,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 ) @@ -1343,6 +1375,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) @@ -2085,7 +2118,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 @@ -2207,6 +2240,66 @@ void wxBoxSizer::RecalcSizes() nonFixedSpaceChanged = true; } + // Similar to the previous loop, but dealing with items whose max size + // is less than what we would allocate to them taking their proportion + // into account. + nonFixedSpaceChanged = false; + for ( i = m_children.begin(), n = 0; ; ++i, ++n ) + { + if ( nonFixedSpaceChanged ) + { + i = m_children.begin(); + n = 0; + nonFixedSpaceChanged = false; + } + + // check for the end of the loop only after the check above as + // otherwise we wouldn't do another pass if the last child resulted + // in non fixed space reduction + if ( i == m_children.end() ) + break; + + wxSizerItem * const item = *i; + + if ( !item->IsShown() ) + continue; + + // don't check the item which we had already dealt with during a + // previous pass (this is more than an optimization, the code + // wouldn't work correctly if we kept adjusting for the same item + // over and over again) + if ( majorSizes[n] != wxDefaultCoord ) + continue; + + wxCoord maxMajor = GetSizeInMajorDir(item->GetMaxSizeWithBorder()); + + // must be nonzero, fixed-size items were dealt with in previous loop + const int propItem = item->GetProportion(); + + // is the desired size of this item small enough? + if ( maxMajor < 0 || + (remaining*propItem)/totalProportion <= maxMajor ) + { + // yes, it is, we'll determine the real size of this + // item later, for now just leave it as wxDefaultCoord + continue; + } + + // the proportion of this item won't count, it has + // effectively become fixed + totalProportion -= propItem; + + // we can already allocate space for this item + majorSizes[n] = maxMajor; + + // change the amount of the space remaining to the other items, + // as this can result in not being able to satisfy their + // proportions any more we will need to redo another loop + // iteration + remaining -= maxMajor; + + nonFixedSpaceChanged = true; + } // Last by one pass: distribute the remaining space among the non-fixed // items whose size weren't fixed yet according to their proportions. @@ -2258,8 +2351,15 @@ void wxBoxSizer::RecalcSizes() // its minimal size which is bad but better than not showing parts // of the window at all minorSize = totalMinorSize; + + // do not allow the size in the minor direction to grow beyond the max + // size of the item in the minor direction + const wxCoord maxMinorSize = GetSizeInMinorDir(item->GetMaxSizeWithBorder()); + if ( maxMinorSize >= 0 && minorSize > maxMinorSize ) + minorSize = maxMinorSize; } - else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) ) + + if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) ) { PosInMinorDir(posChild) += totalMinorSize - minorSize; } @@ -2389,8 +2489,12 @@ 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 + // this is independent of the title, therefore top_border is not relevant + m_position.x = m_position.y = 10; #else - // if the wxStaticBox has childrens, then these windows must be placed + // if the wxStaticBox has children, then these windows must be placed // by the wxBoxSizer::RecalcSizes() call below using coordinates relative // to the top-left corner of the staticbox (but unlike wxGTK, we need // to keep in count the static borders here!): @@ -2567,46 +2671,38 @@ void wxStdDialogButtonSizer::Realize() // Extra space around and at the right Add(12, 40); #elif defined(__WXGTK20__) - Add(0, 0, 0, wxLEFT, 9); - if (m_buttonHelp) - Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en + // says that the correct button order is + // + // [Help] [Alternative] [Cancel] [Affirmative] - // extra whitespace between help and cancel/ok buttons - Add(0, 0, 1, wxEXPAND, 0); + // Flags ensuring that margins between the buttons are 6 pixels. + const wxSizerFlags + flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3); - if (m_buttonNegative){ - Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); - } + // Margin around the entire sizer button should be 12. + AddSpacer(9); - if (m_buttonApply) - { - // according to HIG, in explicit apply windows the order is: - // [ Help Apply Cancel OK ] + if (m_buttonHelp) + Add(m_buttonHelp, flagsBtn); - Add((wxWindow*)m_buttonApply, - 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + // Align the rest of the buttons to the right. + AddStretchSpacer(); - if (m_buttonCancel) - Add((wxWindow*)m_buttonCancel, - 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + if (m_buttonNegative) + Add(m_buttonNegative, flagsBtn); - if (m_buttonAffirmative) - Add((wxWindow*)m_buttonAffirmative, - 0, wxALIGN_CENTRE | wxLEFT, 6); - } - else - { - // without an Apply button, have the buttons representing - // affirmative and negative close to each other. + if (m_buttonApply) + Add(m_buttonApply, flagsBtn); - if (m_buttonAffirmative) - Add((wxWindow*)m_buttonAffirmative, - 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + if (m_buttonCancel) + Add(m_buttonCancel, flagsBtn); - if (m_buttonCancel) - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, 6); - } + if (m_buttonAffirmative) + Add(m_buttonAffirmative, flagsBtn); + // Ensure that the right margin is 12 as well. + AddSpacer(9); #elif defined(__WXMSW__) // Windows