X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/428c07c0f8ea28bbda605c368040713db7a7e460..8f4745feeb2850f3bebb3af45407e164550d541a:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 38753c7544..ad5f899c8c 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -17,8 +17,8 @@ #pragma hdrstop #endif -#include "wx/display.h" #include "wx/sizer.h" +#include "wx/private/flagscheck.h" #ifndef WX_PRECOMP #include "wx/string.h" @@ -31,6 +31,7 @@ #include "wx/toplevel.h" #endif // WX_PRECOMP +#include "wx/display.h" #include "wx/listimpl.cpp" @@ -87,6 +88,31 @@ WX_DEFINE_EXPORTED_LIST( wxSizerItemList ) // wxSizerItem // ---------------------------------------------------------------------------- +// check for flags conflicts +static const int SIZER_FLAGS_MASK = + wxADD_FLAG(wxCENTRE, + wxADD_FLAG(wxHORIZONTAL, + wxADD_FLAG(wxVERTICAL, + wxADD_FLAG(wxLEFT, + wxADD_FLAG(wxRIGHT, + wxADD_FLAG(wxUP, + wxADD_FLAG(wxDOWN, + wxADD_FLAG(wxALIGN_NOT, + wxADD_FLAG(wxALIGN_CENTER_HORIZONTAL, + wxADD_FLAG(wxALIGN_RIGHT, + wxADD_FLAG(wxALIGN_BOTTOM, + wxADD_FLAG(wxALIGN_CENTER_VERTICAL, + wxADD_FLAG(wxFIXED_MINSIZE, + wxADD_FLAG(wxRESERVE_SPACE_EVEN_IF_HIDDEN, + wxADD_FLAG(wxSTRETCH_NOT, + wxADD_FLAG(wxSHRINK, + wxADD_FLAG(wxGROW, + wxADD_FLAG(wxSHAPED, + 0)))))))))))))))))); + +#define ASSERT_VALID_SIZER_FLAGS(f) wxASSERT_VALID_FLAGS(f, SIZER_FLAGS_MASK) + + void wxSizerItem::Init(const wxSizerFlags& flags) { Init(); @@ -94,6 +120,8 @@ void wxSizerItem::Init(const wxSizerFlags& flags) m_proportion = flags.GetProportion(); m_flag = flags.GetFlags(); m_border = flags.GetBorderInPixels(); + + ASSERT_VALID_SIZER_FLAGS( m_flag ); } wxSizerItem::wxSizerItem() @@ -136,6 +164,8 @@ wxSizerItem::wxSizerItem(wxWindow *window, m_id(wxID_NONE), m_userData(userData) { + ASSERT_VALID_SIZER_FLAGS( m_flag ); + DoSetWindow(window); } @@ -160,6 +190,8 @@ wxSizerItem::wxSizerItem(wxSizer *sizer, m_ratio(0.0), m_userData(userData) { + ASSERT_VALID_SIZER_FLAGS( m_flag ); + DoSetSizer(sizer); // m_minSize is set later @@ -189,6 +221,8 @@ wxSizerItem::wxSizerItem(int width, m_id(wxID_NONE), m_userData(userData) { + ASSERT_VALID_SIZER_FLAGS( m_flag ); + DoSetSpacer(wxSize(width, height)); } @@ -446,12 +480,23 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ ) break; case Item_Window: + { + // Use wxSIZE_FORCE_EVENT here since a sizer item might + // 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. +#if 1 + m_window->SetSize(pos.x, pos.y, size.x, size.y, + wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT ); +#else m_window->SetSize(pos.x, pos.y, size.x, size.y, - wxSIZE_ALLOW_MINUS_ONE); + wxSIZE_ALLOW_MINUS_ONE ); +#endif break; - + } case Item_Sizer: - m_sizer->SetDimension(pos.x, pos.y, size.x, size.y); + m_sizer->SetDimension(pos, size); break; case Item_Spacer: @@ -522,6 +567,9 @@ void wxSizerItem::Show( bool show ) bool wxSizerItem::IsShown() const { + if ( m_flag & wxRESERVE_SPACE_EVEN_IF_HIDDEN ) + return true; + switch ( m_kind ) { case Item_None: @@ -940,16 +988,6 @@ void wxSizer::SetVirtualSizeHints( wxWindow *window ) } #endif // WXWIN_COMPATIBILITY_2_8 -wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const -{ - return window->GetMaxSize(); -} - -wxSize wxSizer::GetMinWindowSize( wxWindow *window ) -{ - return window->ClientToWindowSize(GetMinSize()); -} - // TODO on mac we need a function that determines how much free space this // min size contains, in order to make sure that we have 20 pixels of free // space around the controls @@ -978,15 +1016,6 @@ wxSize wxSizer::VirtualFitSize( wxWindow *window ) return size; } -void wxSizer::SetDimension( int x, int y, int width, int height ) -{ - m_position.x = x; - m_position.y = y; - m_size.x = width; - m_size.y = height; - Layout(); -} - wxSize wxSizer::GetMinSize() { wxSize ret( CalcMin() ); @@ -1304,29 +1333,69 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) { } -int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const +wxSizerItem *wxGridSizer::Insert(size_t index, wxSizerItem *item) { - int nitems = m_children.GetCount(); - if ( nitems) + // if only the number of columns or the number of rows is specified for a + // sizer, arbitrarily many items can be added to it but if both of them are + // fixed, then the sizer can't have more than that many items -- check for + // this here to ensure that we detect errors as soon as possible + if ( m_cols && m_rows ) { - if ( m_cols ) - { - ncols = m_cols; - nrows = (nitems + m_cols - 1) / m_cols; - } - else if ( m_rows ) + const int nitems = m_children.GetCount(); + if ( nitems == m_cols*m_rows ) { - ncols = (nitems + m_rows - 1) / m_rows; - nrows = m_rows; - } - else // 0 columns, 0 rows? - { - wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") ); + wxFAIL_MSG( + wxString::Format( + "too many items (%d > %d*%d) in grid sizer (maybe you " + "should omit the number of either rows or columns?)", + nitems + 1, m_cols, m_rows) + ); - nrows = ncols = 0; + // additionally, continuing to use the specified number of columns + // and rows is not a good idea as callers of CalcRowsCols() expect + // that all sizer items can fit into m_cols/m_rows-sized arrays + // which is not the case if there are too many items and results in + // crashes, so let it compute the number of rows automatically by + // forgetting the (wrong) number of rows specified (this also has a + // nice side effect of giving only one assert even if there are + // many more items than allowed in this sizer) + m_rows = 0; } } + return wxSizer::Insert(index, item); +} + +int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const +{ + const int nitems = m_children.GetCount(); + if ( m_cols && m_rows ) + { + ncols = m_cols; + nrows = m_rows; + + // this should be impossible because the too high number of items + // should have been detected by Insert() above + wxASSERT_MSG( nitems <= ncols*nrows, "logic error in wxGridSizer" ); + } + else if ( m_cols ) + { + ncols = m_cols; + nrows = (nitems + m_cols - 1) / m_cols; + } + else if ( m_rows ) + { + ncols = (nitems + m_rows - 1) / m_rows; + nrows = m_rows; + } + else // 0 columns, 0 rows? + { + wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") ); + + nrows = + ncols = 0; + } + return nitems; } @@ -1613,11 +1682,9 @@ wxSize wxFlexGridSizer::CalcMin() m_rowHeights.assign(nrows, -1); m_colWidths.assign(ncols, -1); - // n is the index of the item in left-to-right top-to-bottom order - size_t n = 0; for ( wxSizerItemList::iterator i = m_children.begin(); i != m_children.end(); - ++i, ++n ) + ++i) { wxSizerItem * const item = *i; if ( item->IsShown() ) @@ -1746,6 +1813,37 @@ DoAdjustForGrowables(int delta, void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz) { +#if wxDEBUG_LEVEL + // by the time this function is called, the sizer should be already fully + // initialized and hence the number of its columns and rows is known and we + // can check that all indices in m_growableCols/Rows are valid (see also + // comments in AddGrowableCol/Row()) + if ( !m_rows || !m_cols ) + { + int nrows, ncols; + CalcRowsCols(nrows, ncols); + + if ( !m_rows ) + { + for ( size_t n = 0; n < m_growableRows.size(); n++ ) + { + wxASSERT_MSG( m_growableRows[n] < nrows, + "invalid growable row index" ); + } + } + + if ( !m_cols ) + { + for ( size_t n = 0; n < m_growableCols.size(); n++ ) + { + wxASSERT_MSG( m_growableCols[n] < ncols, + "invalid growable column index" ); + } + } + } +#endif // wxDEBUG_LEVEL + + if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) { DoAdjustForGrowables @@ -1771,21 +1869,21 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz) { const int col = n % ncols; didAdjustMinSize |= (*i)->InformFirstDirection(wxHORIZONTAL, m_colWidths[col], sz.y - m_calculatedMinSize.y); - } + } // Only redo if info was actually used if( didAdjustMinSize ) - { - DoAdjustForGrowables - ( - sz.x - m_calculatedMinSize.x, - m_growableCols, - m_colWidths, - m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions - : NULL - ); + { + DoAdjustForGrowables + ( + sz.x - m_calculatedMinSize.x, + m_growableCols, + m_colWidths, + m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions + : NULL + ); + } } -} if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) { @@ -1802,15 +1900,46 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz) } } +bool wxFlexGridSizer::IsRowGrowable( size_t idx ) +{ + return m_growableRows.Index( idx ) != wxNOT_FOUND; +} + +bool wxFlexGridSizer::IsColGrowable( size_t idx ) +{ + return m_growableCols.Index( idx ) != wxNOT_FOUND; +} void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) { + int nrows, ncols; + CalcRowsCols(nrows, ncols); + + wxASSERT_MSG( !IsRowGrowable( idx ), + "AddGrowableRow() called for growable row" ); + + // notice that we intentionally don't check the index validity here in (the + // common) case when the number of rows was not specified in the ctor -- in + // this case it will be computed only later, when all items are added to + // the sizer, and the check will be done in AdjustForGrowables() + wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" ); + m_growableRows.Add( idx ); m_growableRowsProportions.Add( proportion ); } void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) { + int nrows, ncols; + CalcRowsCols(nrows, ncols); + + wxASSERT_MSG( !IsColGrowable( idx ), + "AddGrowableCol() called for growable column" ); + + // see comment in AddGrowableRow(): although it's less common to omit the + // specification of the number of columns, it still can also happen + wxCHECK_RET( !m_cols || idx < (size_t)ncols, "invalid column index" ); + m_growableCols.Add( idx ); m_growableColsProportions.Add( proportion ); } @@ -1908,15 +2037,22 @@ void wxBoxSizer::RecalcSizes() // adjust the size in the major direction using the proportion wxCoord majorSize = GetSizeInMajorDir(sizeThis); - const int propItem = item->GetProportion(); - if ( propItem ) + + // if there is not enough space, don't try to distribute negative space + // among the children, this would result in overlapping windows which + // we don't want + if ( delta > 0 ) { - const int deltaItem = (delta * propItem) / totalProportion; + const int propItem = item->GetProportion(); + if ( propItem ) + { + const int deltaItem = (delta * propItem) / totalProportion; - majorSize += deltaItem; + majorSize += deltaItem; - delta -= deltaItem; - totalProportion -= propItem; + delta -= deltaItem; + totalProportion -= propItem; + } } @@ -1935,7 +2071,7 @@ void wxBoxSizer::RecalcSizes() } // NB: wxCENTRE is used here only for backwards compatibility, // wxALIGN_CENTRE should be used in new code - else if ( flag & (wxCENTER | wxALIGN_CENTRE) ) + else if ( flag & (wxCENTER | (IsVertical() ? wxALIGN_CENTRE_HORIZONTAL : wxALIGN_CENTRE_VERTICAL))) { PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2; } @@ -1985,224 +2121,6 @@ wxSize wxBoxSizer::CalcMin() return m_minSize; } -//--------------------------------------------------------------------------- -// wxWrapSizer -//--------------------------------------------------------------------------- - -#define wxDEFAULT_PROPORTION_LAST 1000000 - -// User data to hold old proportion for last item on line -// (which might be extended) -struct wxPropHolder : public wxObject -{ - wxPropHolder( ) : m_item(0), m_propOld(0) { } - void Init( wxSizerItem *item, int propOld ) { m_item=item; m_propOld=propOld; } - - wxSizerItem *m_item; - int m_propOld; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer); - -wxWrapSizer::wxWrapSizer( int orient, int flags ) - : wxBoxSizer(orient), - m_prim_size_last( -1 ), - m_rows(orient^wxBOTH), - m_flags(flags) -{ -} - -wxWrapSizer::~wxWrapSizer() -{ - // Have to clear grand child items so that they're not deleted twice - for( int ix=m_rows.GetChildren().GetCount()-1; ix>=0; ix-- ) - { - wxSizer *psz = m_rows.GetItem((size_t)ix)->GetSizer(); - wxSizerItemList &sl = psz->GetChildren(); - while( sl.GetLast() ) - sl.Erase( sl.GetLast() ); - } -} - - -bool wxWrapSizer::InformFirstDirection( int direction, int size, int WXUNUSED(availableOtherDir) ) -{ - if( !direction ) - { - // Better to keep value, then CalcMin will work better - //m_prim_size_last = -1; - return false; - } - if( direction==m_orient ) - { - // The direction is same as our primary, so we can make use of it - m_prim_size_last = size; - return true; - } - else - return false; -} - - -void wxWrapSizer::AdjustPropLastItem(wxSizer *psz, wxSizerItem *itemLast) -{ - wxSizerItem *psi = m_rows.GetItem(psz); - wxASSERT(psi); - wxPropHolder *pph = (wxPropHolder*)psi->GetUserData(); - if ( !pph ) - psi->SetUserData( pph=new wxPropHolder ); - - pph->Init( itemLast, itemLast->GetProportion() ); - itemLast->SetProportion( wxDEFAULT_PROPORTION_LAST ); -} - -void wxWrapSizer::RecalcSizes() -{ - wxASSERT( m_orient&wxBOTH ); - if (m_children.GetCount() == 0) - return; - - // What we do here is to put our items into child box sizers, - // as many of them as we have lines. - - // Empty all items in all rows in owned sizer. - // We have to access the list directly, since we don't want to - // destroy the wxSizerItems. - for( int ix=m_rows.GetChildren().GetCount()-1; ix>=0; ix-- ){ - wxSizerItem *psi = m_rows.GetItem( (size_t)ix ); - - // Restore proportion for last item on line (if item has not been deleted) - wxPropHolder *pph = (wxPropHolder*)psi->GetUserData(); - if( pph && GetChildren().Find(pph->m_item) ) - pph->m_item->SetProportion(pph->m_propOld); - - wxSizer *psz = psi->GetSizer(); - wxASSERT( psz ); - wxSizerItemList &sl = psz->GetChildren(); - while( sl.GetLast() ) - sl.Erase( sl.GetLast() ); - } - - int lineSumMajor = 0; - int majorSize = GetSizeInMajorDir(m_size); - - // Make sure we have at least one child sizer - m_n_line = 1; - if( !m_rows.GetChildren().GetCount() ) - m_rows.Add( new wxBoxSizer(GetOrientation()), 1, wxEXPAND ); - - // The sizer where to insert items in - wxSizer *psz = m_rows.GetItem((size_t)0)->GetSizer(); - wxASSERT( psz ); - - // Now put our child items into child sizers instead - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - wxSizerItem *item = NULL, *itemLast=NULL; - while (node) - { - item = node->GetData(); - if ( item->IsShown() ) - { - wxSize minSz = item->GetMinSize(); - int minSzMajor = GetSizeInMajorDir(minSz); - - // More space on this line? - if( !lineSumMajor || lineSumMajor+minSzMajor<=majorSize ) - { - lineSumMajor += minSzMajor; - } - else - { - lineSumMajor = minSzMajor; - // Get a new empty sizer to insert into - if( (int)m_rows.GetChildren().GetCount()<=m_n_line ) - m_rows.Add( new wxBoxSizer(GetOrientation()), 1, wxEXPAND ); - - // If we have extend-last-on-each-line mode, then do so now - // Note: We must store old proportion value then. - if( m_flags&wxEXTEND_LAST_ON_EACH_LINE ) - AdjustPropLastItem(psz,itemLast); - - // The sizer where to insert items in - psz = m_rows.GetItem(m_n_line++)->GetSizer(); - } - itemLast = item; - psz->Add( item ); - // If item is a window, it now has a pointer to the child sizer, - // which is wrong. Set it to point to us. - if( item->GetWindow() ) - item->GetWindow()->SetContainingSizer( this ); - } - node = node->GetNext(); - } - - // If we have extend-last-on-each-line mode, then do so now - if( m_flags&wxEXTEND_LAST_ON_EACH_LINE ) - AdjustPropLastItem(psz,itemLast); - - // If we have more sizers than lines, remove them - while( (int)m_rows.GetChildren().GetCount()>m_n_line ) - m_rows.Remove( m_n_line ); - - // Now do layout on row sizer - m_rows.SetDimension( m_position.x, m_position.y, m_size.x, m_size.y ); - - // Remember this to next time (will be overridden by InformFirstDirection if used) - m_prim_size_last = GetSizeInMajorDir(m_size); -} - - -wxSize wxWrapSizer::CalcMin() -{ - if (m_children.GetCount() == 0) - return wxSize(); - - // Algorithm for calculating min size: (assuming horizontal orientation) - // X: Max width of all members - // Y: Based on last X, calculate how many lines needed - // First time around, assume all items fits on one line - - int maxMajor = 0; - int minorSum = 0; - int lineMaxMinor = 0; - int lineSumMajor = 0; - m_n_line = 0; - - // precalc item minsizes and fit on lines (preliminary) - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - if ( item->IsShown() ) - { - wxSize minSz = item->CalcMin(); - int szMajor = GetSizeInMajorDir(minSz); - int szMinor = GetSizeInMinorDir(minSz); - if( szMajor>maxMajor ) maxMajor = szMajor; - // More space on this line? - if( m_prim_size_last<0 || !lineSumMajor || - lineSumMajor+szMajor<=m_prim_size_last ) - { - lineSumMajor += szMajor; - if( szMinor>lineMaxMinor ) - lineMaxMinor = szMinor; - } - else - { - minorSum += lineMaxMinor; // Add height of highest item on last line - m_n_line++; - lineMaxMinor = szMinor; - lineSumMajor = szMajor; - } - } - node = node->GetNext(); - } - minorSum += lineMaxMinor; // Add height of highest item on last line - - m_minSize = SizeFromMajorMinor(maxMajor, minorSum); - return m_minSize; -} - //--------------------------------------------------------------------------- // wxStaticBoxSizer //--------------------------------------------------------------------------- @@ -2233,29 +2151,44 @@ wxStaticBoxSizer::~wxStaticBoxSizer() delete m_staticBox; } -static void GetStaticBoxBorders( wxStaticBox *box, - int *borderTop, - int *borderOther) -{ - // this has to be done platform by platform as there is no way to - // guess the thickness of a wxStaticBox border - box->GetBordersForSizer(borderTop, borderOther); -} - void wxStaticBoxSizer::RecalcSizes() { int top_border, other_border; - GetStaticBoxBorders(m_staticBox, &top_border, &other_border); + m_staticBox->GetBordersForSizer(&top_border, &other_border); m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); - wxPoint old_pos( m_position ); - m_position.x += other_border; - m_position.y += top_border; wxSize old_size( m_size ); m_size.x -= 2*other_border; m_size.y -= top_border + other_border; + wxPoint old_pos( m_position ); + if (m_staticBox->GetChildren().GetCount() > 0) + { +#if defined( __WXGTK20__ ) + // if the wxStaticBox has created a wxPizza to contain its children + // (see wxStaticBox::AddChild) then we need to place the items it contains + // in the wxBoxSizer::RecalcSizes() call below using coordinates relative + // to the top-left corner of the staticbox: + m_position.x = m_position.y = 0; +#else + // if the wxStaticBox has childrens, 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!): + m_position.x = other_border; + m_position.y = top_border; +#endif + } + else + { + // the windows contained in the staticbox have been created as siblings of the + // staticbox (this is the "old" way of staticbox contents creation); in this + // case we need to position them with coordinates relative to our common parent + m_position.x += other_border; + m_position.y += top_border; + } + wxBoxSizer::RecalcSizes(); m_position = old_pos; @@ -2265,10 +2198,17 @@ void wxStaticBoxSizer::RecalcSizes() wxSize wxStaticBoxSizer::CalcMin() { int top_border, other_border; - GetStaticBoxBorders(m_staticBox, &top_border, &other_border); + m_staticBox->GetBordersForSizer(&top_border, &other_border); wxSize ret( wxBoxSizer::CalcMin() ); ret.x += 2*other_border; + + // ensure that we're wide enough to show the static box label (there is no + // need to check for the static box best size in vertical direction though) + const int boxWidth = m_staticBox->GetBestSize().x; + if ( ret.x < boxWidth ) + ret.x = boxWidth; + ret.y += other_border + top_border; return ret; @@ -2296,6 +2236,10 @@ bool wxStaticBoxSizer::Detach( wxWindow *window ) #endif // wxUSE_STATBOX +//--------------------------------------------------------------------------- +// wxStdDialogButtonSizer +//--------------------------------------------------------------------------- + #if wxUSE_BUTTON wxStdDialogButtonSizer::wxStdDialogButtonSizer() @@ -2403,7 +2347,7 @@ void wxStdDialogButtonSizer::Realize() } // Extra space around and at the right - Add(12, 24); + Add(12, 40); #elif defined(__WXGTK20__) Add(0, 0, 0, wxLEFT, 9); if (m_buttonHelp)