X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ef2e675a59798f7074696727bdb1a24da178a2c..12447831a8ebc506f730cafac6f6ef13f243b7d2:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index b3736d1754..125f342b32 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -2,7 +2,7 @@ // Name: sizer.cpp // Purpose: provide new wxSizer class for layout // Author: Robert Roebling and Robin Dunn -// Modified by: +// Modified by: Ron Lee // Created: // RCS-ID: $Id$ // Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling @@ -27,14 +27,16 @@ //--------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject); -IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject); -IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer); -IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer); -IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer); -IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer); +IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer) +IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer) +IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer) +#if wxUSE_STATBOX +IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer) +#endif #if wxUSE_NOTEBOOK -IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer); +IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer) #endif //--------------------------------------------------------------------------- @@ -196,7 +198,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) size.x = rwidth; } } - + // This is what GetPosition() returns. Since we calculate // borders afterwards, GetPosition() will be the left/top // corner of the surrounding border. @@ -230,6 +232,15 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) m_size = size; } +void wxSizerItem::DeleteWindows() +{ + if (m_window) + m_window->Destroy(); + + if (m_sizer) + m_sizer->DeleteWindows(); +} + bool wxSizerItem::IsWindow() { return (m_window != NULL); @@ -258,11 +269,13 @@ wxSizer::wxSizer() wxSizer::~wxSizer() { + Clear(); } void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Append( new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -278,6 +291,7 @@ void wxSizer::Add( int width, int height, int option, int flag, int border, wxOb void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -293,6 +307,7 @@ void wxSizer::Prepend( int width, int height, int option, int flag, int border, void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -315,6 +330,7 @@ bool wxSizer::Remove( wxWindow *window ) wxSizerItem *item = (wxSizerItem*)node->Data(); if (item->GetWindow() == window) { + item->GetWindow()->SetContainingSizer(NULL); m_children.DeleteNode( node ); return TRUE; } @@ -353,7 +369,38 @@ bool wxSizer::Remove( int pos ) return TRUE; } -void wxSizer::Fit( wxWindow *window ) +void wxSizer::Clear( bool delete_windows ) +{ + // First clear the ContainingSizer pointers + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->IsWindow()) + item->GetWindow()->SetContainingSizer(NULL); + node = node->Next(); + } + + // Destroy the windows if needed + if (delete_windows) + DeleteWindows(); + + // Now empty the list + m_children.Clear(); +} + +void wxSizer::DeleteWindows() +{ + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + item->DeleteWindows(); + node = node->Next(); + } +} + +wxSize wxSizer::Fit( wxWindow *window ) { wxSize size; if (window->IsTopLevel()) @@ -362,6 +409,19 @@ void wxSizer::Fit( wxWindow *window ) size = GetMinWindowSize( window ); window->SetSize( size ); + + return size; +} + +void wxSizer::FitInside( wxWindow *window ) +{ + wxSize size; + if (window->IsTopLevel()) + size = VirtualFitSize( window ); + else + size = GetMinClientSize( window ); + + window->SetVirtualSize( size ); } void wxSizer::Layout() @@ -372,22 +432,33 @@ void wxSizer::Layout() void wxSizer::SetSizeHints( wxWindow *window ) { - wxSize size = FitSize( window ); - window->SetSizeHints( size.x, size.y ); + // Preserve the window's max size hints, but set the + // lower bound according to the sizer calculations. + + wxSize size = Fit( window ); + + window->SetSizeHints( size.x, + size.y, + window->GetMaxWidth(), + window->GetMaxHeight() ); } -wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) +void wxSizer::SetVirtualSizeHints( wxWindow *window ) { - wxSize sizeMax = wxGetDisplaySize(); - // make the max size a bit smaller than the screen, a window which takes - // the entire screen doesn't look very nice neither - sizeMax.x *= 9; - sizeMax.x /= 10; - - sizeMax.y *= 9; - sizeMax.y /= 10; + // Preserve the window's max size hints, but set the + // lower bound according to the sizer calculations. + + FitInside( window ); + wxSize size( window->GetVirtualSize() ); + window->SetVirtualSizeHints( size.x, + size.y, + window->GetMaxWidth(), + window->GetMaxHeight() ); +} - return sizeMax; +wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) +{ + return window->GetMaxSize(); } wxSize wxSizer::GetMinWindowSize( wxWindow *window ) @@ -405,9 +476,47 @@ wxSize wxSizer::FitSize( wxWindow *window ) wxSize size = GetMinWindowSize( window ); wxSize sizeMax = GetMaxWindowSize( window ); - if ( size.x > sizeMax.x ) + // Limit the size if sizeMax != wxDefaultSize + + if ( size.x > sizeMax.x && sizeMax.x != -1 ) size.x = sizeMax.x; - if ( size.y > sizeMax.y ) + if ( size.y > sizeMax.y && sizeMax.y != -1 ) + size.y = sizeMax.y; + + return size; +} + +wxSize wxSizer::GetMaxClientSize( wxWindow *window ) +{ + wxSize maxSize( window->GetMaxSize() ); + + if( maxSize != wxDefaultSize ) + { + wxSize size( window->GetSize() ); + wxSize client_size( window->GetClientSize() ); + + return wxSize( maxSize.x + client_size.x - size.x, + maxSize.y + client_size.y - size.y ); + } + else + return wxDefaultSize; +} + +wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) ) +{ + return GetMinSize(); // Already returns client size. +} + +wxSize wxSizer::VirtualFitSize( wxWindow *window ) +{ + wxSize size = GetMinClientSize( window ); + wxSize sizeMax = GetMaxClientSize( window ); + + // Limit the size if sizeMax != wxDefaultSize + + if ( size.x > sizeMax.x && sizeMax.x != -1 ) + size.x = sizeMax.x; + if ( size.y > sizeMax.y && sizeMax.y != -1 ) size.y = sizeMax.y; return size; @@ -941,14 +1050,43 @@ wxSize wxBoxSizer::CalcMin() m_fixedWidth = 0; m_fixedHeight = 0; + // Find how long each stretch unit needs to be + int stretchSize = 1; wxNode *node = m_children.GetFirst(); while (node) + { + wxSizerItem *item = (wxSizerItem*) node->Data(); + if (item->GetOption() != 0) + { + int stretch = item->GetOption(); + wxSize size( item->CalcMin() ); + int sizePerStretch; + // Integer division rounded up is (a + b - 1) / b + if (m_orient == wxHORIZONTAL) + sizePerStretch = ( size.x + stretch - 1 ) / stretch; + else + sizePerStretch = ( size.y + stretch - 1 ) / stretch; + if (sizePerStretch > stretchSize) + stretchSize = sizePerStretch; + } + node = node->Next(); + } + // Calculate overall minimum size + node = m_children.GetFirst(); + while (node) { wxSizerItem *item = (wxSizerItem*) node->Data(); m_stretchable += item->GetOption(); - + wxSize size( item->CalcMin() ); + if (item->GetOption() != 0) + { + if (m_orient == wxHORIZONTAL) + size.x = stretchSize * item->GetOption(); + else + size.y = stretchSize * item->GetOption(); + } if (m_orient == wxHORIZONTAL) { @@ -969,7 +1107,7 @@ wxSize wxBoxSizer::CalcMin() m_fixedWidth = wxMax( m_fixedWidth, size.x ); } else - { + { m_fixedWidth += size.x; m_fixedHeight = wxMax( m_fixedHeight, size.y ); } @@ -985,6 +1123,8 @@ wxSize wxBoxSizer::CalcMin() // wxStaticBoxSizer //--------------------------------------------------------------------------- +#if wxUSE_STATBOX + wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) : wxBoxSizer( orient ) { @@ -1004,7 +1144,7 @@ static void GetStaticBoxBorders(wxStaticBox *box, else #endif // __WXGTK__ *borderTop = 15; - + (void)box; *borderOther = 5; } @@ -1040,6 +1180,8 @@ wxSize wxStaticBoxSizer::CalcMin() return ret; } +#endif // wxUSE_STATBOX + //--------------------------------------------------------------------------- // wxNotebookSizer //--------------------------------------------------------------------------- @@ -1060,24 +1202,15 @@ void wxNotebookSizer::RecalcSizes() wxSize wxNotebookSizer::CalcMin() { - // This will have to be done platform by platform - // as there is no way to guess the thickness of - // the wxNotebook tabs and border. + wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0)); - int borderX = 5; - int borderY = 5; - if ((m_notebook->HasFlag(wxNB_RIGHT)) || - (m_notebook->HasFlag(wxNB_LEFT))) - { - borderX += 90; // improvements later.. - } - else - { - borderY += 40; // improvements later.. - } + sizeBorder.x += 5; + sizeBorder.y += 5; if (m_notebook->GetChildren().GetCount() == 0) - return wxSize(borderX + 10, borderY + 10); + { + return wxSize(sizeBorder.x + 10, sizeBorder.y + 10); + } int maxX = 0; int maxY = 0; @@ -1092,14 +1225,18 @@ wxSize wxNotebookSizer::CalcMin() { wxSize subsize( itemsizer->CalcMin() ); - if (subsize.x > maxX) maxX = subsize.x; - if (subsize.y > maxY) maxY = subsize.y; + if (subsize.x > maxX) + maxX = subsize.x; + if (subsize.y > maxY) + maxY = subsize.y; } node = node->GetNext(); } - return wxSize( borderX + maxX, borderY + maxY ); + return wxSize( maxX, maxY ) + sizeBorder; } #endif // wxUSE_NOTEBOOK + +// vi:sts=4:sw=4:et