X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61d514bb2fe17e985bfcd05857aeefdf109e4044..c97e7fa8dbda704c9c9cdb61c22ebdf9b692e114:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index ea3019c037..b3736d1754 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1,273 +1,851 @@ ///////////////////////////////////////////////////////////////////////////// // Name: sizer.cpp -// Purpose: provide wxNewSizer class for layounting +// Purpose: provide new wxSizer class for layout // Author: Robert Roebling and Robin Dunn // Modified by: -// Created: +// Created: // RCS-ID: $Id$ // Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __WXSIZERS_H__ -#define __WXSIZERS_H__ - #ifdef __GNUG__ #pragma implementation "sizer.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #include "wx/sizer.h" #include "wx/utils.h" +#include "wx/statbox.h" +#include "wx/notebook.h" //--------------------------------------------------------------------------- -// wxNewSizerItem + +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); +#if wxUSE_NOTEBOOK +IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer); +#endif + +//--------------------------------------------------------------------------- +// wxSizerItem //--------------------------------------------------------------------------- -wxNewSizerItem::wxNewSizerItem( int width, int height, int option ) +wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData ) { m_window = (wxWindow *) NULL; - m_sizer = (wxNewSizer *) NULL; + m_sizer = (wxSizer *) NULL; + m_option = option; + m_border = border; + m_flag = flag; + m_userData = userData; + + // minimal size is the initial size m_minSize.x = width; m_minSize.y = height; - m_option = option; + + SetRatio(width, height); + + // size is set directly + m_size = m_minSize; } -wxNewSizerItem::wxNewSizerItem( wxWindow *window, int option ) +wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_window = window; - m_sizer = (wxNewSizer *) NULL; - m_minSize = window->GetSize(); + m_sizer = (wxSizer *) NULL; m_option = option; + m_border = border; + m_flag = flag; + m_userData = userData; + + // minimal size is the initial size + m_minSize = window->GetSize(); + + // aspect ratio calculated from initial size + SetRatio(m_minSize); + + // size is calculated later + // m_size = ... } -wxNewSizerItem::wxNewSizerItem( wxNewSizer *sizer, int option ) +wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) { m_window = (wxWindow *) NULL; m_sizer = sizer; - m_minSize = sizer->GetSize(); m_option = option; + m_border = border; + m_flag = flag; + m_userData = userData; + + // minimal size is calculated later + // m_minSize = ... + m_ratio = 0; + + // size is calculated later + // m_size = ... } -wxSize wxNewSizerItem::GetSize() +wxSizerItem::~wxSizerItem() { - if (IsNewSizer()) - return m_sizer->GetSize(); - - if (IsWindow()) - return m_window->GetSize(); - - return m_minSize; + if (m_userData) + delete m_userData; + if (m_sizer) + delete m_sizer; } -wxSize wxNewSizerItem::CalcMin() + +wxSize wxSizerItem::GetSize() { - if (IsNewSizer()) - return m_sizer->CalcMin(); - + wxSize ret; + if (IsSizer()) + ret = m_sizer->GetSize(); + else if (IsWindow()) - return m_window->GetSize(); - - return m_minSize; + ret = m_window->GetSize(); + else ret = m_size; + + 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; +} + +wxSize wxSizerItem::CalcMin() +{ + wxSize ret; + if (IsSizer()) + { + ret = m_sizer->GetMinSize(); + + // if we have to preserve aspect ratio _AND_ this is + // the first-time calculation, consider ret to be initial size + if ((m_flag & wxSHAPED) && !m_ratio) + SetRatio(ret); + } + else + { + if ( IsWindow() && (m_flag & wxADJUST_MINSIZE) ) + { + // check if the best (minimal, in fact) window size hadn't changed + // by chance: this may happen for, e.g. static text if its label + // changed + wxSize size = m_window->GetBestSize(); + if ( size.x > m_minSize.x ) + m_minSize.x = size.x; + if ( size.y > m_minSize.y ) + m_minSize.y = size.y; + } + + 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; } -void wxNewSizerItem::SetDimension( wxPoint pos, wxSize size ) +void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) { - if (IsNewSizer()) + if (m_flag & wxSHAPED) + { + // adjust aspect ratio + int rwidth = (int) (size.y * m_ratio); + if (rwidth > size.x) + { + // fit horizontally + int rheight = (int) (size.x / m_ratio); + // add vertical space + if (m_flag & wxALIGN_CENTER_VERTICAL) + pos.y += (size.y - rheight) / 2; + else if (m_flag & wxALIGN_BOTTOM) + pos.y += (size.y - rheight); + // use reduced dimensions + size.y =rheight; + } + else if (rwidth < size.x) + { + // add horizontal space + if (m_flag & wxALIGN_CENTER_HORIZONTAL) + pos.x += (size.x - rwidth) / 2; + else if (m_flag & wxALIGN_RIGHT) + pos.x += (size.x - rwidth); + size.x = rwidth; + } + } + + // This is what GetPosition() returns. Since we calculate + // borders afterwards, GetPosition() will be the left/top + // corner of the surrounding border. + m_pos = pos; + + if (m_flag & wxWEST) + { + pos.x += m_border; + size.x -= m_border; + } + if (m_flag & wxEAST) + { + size.x -= m_border; + } + if (m_flag & wxNORTH) + { + pos.y += m_border; + size.y -= m_border; + } + if (m_flag & wxSOUTH) + { + size.y -= m_border; + } + + if (IsSizer()) m_sizer->SetDimension( pos.x, pos.y, size.x, size.y ); - + if (IsWindow()) - m_window->SetSize( pos.x, pos.y, size.x, size.y ); - - m_minSize = size; + m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE ); + + m_size = size; } -bool wxNewSizerItem::IsWindow() +bool wxSizerItem::IsWindow() { return (m_window != NULL); } -bool wxNewSizerItem::IsNewSizer() +bool wxSizerItem::IsSizer() { return (m_sizer != NULL); } -bool wxNewSizerItem::IsSpacer() +bool wxSizerItem::IsSpacer() { return (m_window == NULL) && (m_sizer == NULL); } //--------------------------------------------------------------------------- -// wxNewSizer +// wxSizer //--------------------------------------------------------------------------- -wxNewSizer::wxNewSizer() +wxSizer::wxSizer() { m_children.DeleteContents( TRUE ); + m_minSize.x = 0; + m_minSize.y = 0; +} + +wxSizer::~wxSizer() +{ +} + +void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData ) +{ + m_children.Append( new wxSizerItem( window, option, flag, border, userData ) ); } -wxNewSizer::~wxNewSizer() +void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) { + m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) ); } - -void wxNewSizer::Add( wxWindow *window, int option ) + +void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData ) +{ + m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) ); +} + +void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) ); +} + +void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) { - m_children.Append( new wxNewSizerItem( window, option ) ); + m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) ); +} + +void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) ); +} + +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 ) ); +} + +void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) ); +} + +void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) ); +} + +bool wxSizer::Remove( wxWindow *window ) +{ + wxASSERT( window ); + + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetWindow() == window) + { + m_children.DeleteNode( node ); + return TRUE; + } + node = node->Next(); + } + + return FALSE; } -void wxNewSizer::Add( wxNewSizer *sizer, int option ) +bool wxSizer::Remove( wxSizer *sizer ) { - m_children.Append( new wxNewSizerItem( sizer, option ) ); + wxASSERT( sizer ); + + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetSizer() == sizer) + { + m_children.DeleteNode( node ); + return TRUE; + } + node = node->Next(); + } + + return FALSE; } -void wxNewSizer::Add( int width, int height, int option ) +bool wxSizer::Remove( int pos ) { - m_children.Append( new wxNewSizerItem( width, height, option ) ); + wxNode *node = m_children.Nth( pos ); + if (!node) return FALSE; + + m_children.DeleteNode( node ); + + return TRUE; } -void wxNewSizer::Fit( wxWindow *window ) +void wxSizer::Fit( wxWindow *window ) { - window->SetSize( GetMinWindowSize( window ) ); + wxSize size; + if (window->IsTopLevel()) + size = FitSize( window ); + else + size = GetMinWindowSize( window ); + + window->SetSize( size ); } -void wxNewSizer::Layout() +void wxSizer::Layout() { - m_size = CalcMin(); + CalcMin(); RecalcSizes(); } -void wxNewSizer::SetSizeHints( wxWindow *window ) +void wxSizer::SetSizeHints( wxWindow *window ) { - wxSize size( GetMinWindowSize( window ) ); + wxSize size = FitSize( window ); window->SetSizeHints( size.x, size.y ); } -wxSize wxNewSizer::GetMinWindowSize( wxWindow *window ) +wxSize wxSizer::GetMaxWindowSize( 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; + + return sizeMax; +} + +wxSize wxSizer::GetMinWindowSize( wxWindow *window ) { - wxSize min( GetMinSize() ); + wxSize minSize( GetMinSize() ); wxSize size( window->GetSize() ); wxSize client_size( window->GetClientSize() ); - return wxSize( min.x+size.x-client_size.x, min.y+size.y-client_size.y ); + return wxSize( minSize.x+size.x-client_size.x, + minSize.y+size.y-client_size.y ); } -void wxNewSizer::SetDimension( int x, int y, int width, int height ) +// Return a window size that will fit within the screens dimensions +wxSize wxSizer::FitSize( wxWindow *window ) +{ + wxSize size = GetMinWindowSize( window ); + wxSize sizeMax = GetMaxWindowSize( window ); + + if ( size.x > sizeMax.x ) + size.x = sizeMax.x; + if ( size.y > sizeMax.y ) + size.y = sizeMax.y; + + 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; + CalcMin(); RecalcSizes(); } +wxSize wxSizer::GetMinSize() +{ + wxSize ret( CalcMin() ); + if (ret.x < m_minSize.x) ret.x = m_minSize.x; + if (ret.y < m_minSize.y) ret.y = m_minSize.y; + return ret; +} + +void wxSizer::DoSetMinSize( int width, int height ) +{ + m_minSize.x = width; + m_minSize.y = height; +} + +bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height ) +{ + wxASSERT( window ); + + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetWindow() == window) + { + item->SetInitSize( width, height ); + return TRUE; + } + node = node->Next(); + } + + node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetSizer()) + { + /* It's a sizer, so lets search recursively. */ + if (item->GetSizer()->DoSetItemMinSize( window, width, height )) + { + /* A child sizer found the requested windw, exit. */ + return TRUE; + } + } + node = node->Next(); + } + + return FALSE; +} + +bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height ) +{ + wxASSERT( sizer ); + + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetSizer() == sizer) + { + item->GetSizer()->DoSetMinSize( width, height ); + return TRUE; + } + node = node->Next(); + } + + node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->GetSizer()) + { + /* It's a sizer, so lets search recursively. */ + if (item->GetSizer()->DoSetItemMinSize( sizer, width, height )) + { + /* A child sizer found the requested windw, exit. */ + return TRUE; + } + } + node = node->Next(); + } + + return FALSE; +} + +bool wxSizer::DoSetItemMinSize( int pos, int width, int height ) +{ + wxNode *node = m_children.Nth( pos ); + if (!node) return FALSE; + + wxSizerItem *item = (wxSizerItem*) node->Data(); + if (item->GetSizer()) + { + /* Sizers contains the minimal size in them, if not calculated ... */ + item->GetSizer()->DoSetMinSize( width, height ); + } + else + { + /* ... whereas the minimal size of spacers and windows in stored + in the item */ + item->SetInitSize( width, height ); + } + + return TRUE; +} + //--------------------------------------------------------------------------- -// wxBorderNewSizer +// wxGridSizer //--------------------------------------------------------------------------- -wxBorderNewSizer::wxBorderNewSizer( int sides ) +wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) { - m_sides = sides; + m_rows = rows; + m_cols = cols; + m_vgap = vgap; + m_hgap = hgap; } -void wxBorderNewSizer::Add( wxWindow *window, int option ) +wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) { - wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") ); - - wxNewSizer::Add( window, option ); + m_rows = 0; + m_cols = cols; + m_vgap = vgap; + m_hgap = hgap; } -void wxBorderNewSizer::Add( wxNewSizer *sizer, int option ) +void wxGridSizer::RecalcSizes() { - wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") ); - - wxNewSizer::Add( sizer, option ); + if (m_children.GetCount() == 0) + return; + + int nitems = m_children.GetCount(); + int nrows = m_rows; + int ncols = m_cols; + + if (ncols > 0) + nrows = (nitems + ncols-1) / ncols; + else + ncols = (nitems + nrows-1) / nrows; + + wxSize sz( GetSize() ); + wxPoint pt( GetPosition() ); + + int w = (sz.x - (ncols - 1) * m_hgap) / ncols; + int h = (sz.y - (nrows - 1) * m_vgap) / nrows; + + int x = pt.x; + for (int c = 0; c < ncols; c++) + { + int y = pt.y; + for (int r = 0; r < nrows; r++) + { + int i = r * ncols + c; + if (i < nitems) + { + wxNode *node = m_children.Nth( i ); + wxASSERT( node ); + + SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); + } + y = y + h + m_vgap; + } + x = x + w + m_hgap; + } } -void wxBorderNewSizer::Add( int width, int height, int option ) +wxSize wxGridSizer::CalcMin() { - wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") ); - - wxNewSizer::Add( width, height, option ); + if (m_children.GetCount() == 0) + return wxSize(10,10); + + int nitems = m_children.GetCount(); + int nrows = m_rows; + int ncols = m_cols; + + if (ncols > 0) + nrows = (nitems + ncols-1) / ncols; + else + ncols = (nitems + nrows-1) / nrows; + + /* Find the max width and height for any component */ + int w = 0; + int h = 0; + + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSize sz( item->CalcMin() ); + w = wxMax( w, sz.x ); + h = wxMax( h, sz.y ); + + node = node->Next(); + } + + return wxSize(ncols * w + (ncols-1) * m_hgap, + nrows * h + (nrows-1) * m_vgap); } -void wxBorderNewSizer::RecalcSizes() +void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ) { - wxNode *node = m_children.GetFirst(); - - if (!node) + wxPoint pt( x,y ); + wxSize sz( item->CalcMin() ); + int flag = item->GetFlag(); + + if ((flag & wxEXPAND) || (flag & wxSHAPED)) { - SetDimension( m_position.x, m_position.y, 2, 2 ); - return; + sz = wxSize(w, h); } - - wxNewSizerItem *item = (wxNewSizerItem*) node->Data(); - - wxSize size( m_size ); - wxPoint pt( m_position ); - int borderSize = item->GetOption(); - - if (m_sides & wxWEST) + else { - size.x -= borderSize; - pt.x += borderSize; + if (flag & wxALIGN_CENTER_HORIZONTAL) + { + pt.x = x + (w - sz.x) / 2; + } + else if (flag & wxALIGN_RIGHT) + { + pt.x = x + (w - sz.x); + } + + if (flag & wxALIGN_CENTER_VERTICAL) + { + pt.y = y + (h - sz.y) / 2; + } + else if (flag & wxALIGN_BOTTOM) + { + pt.y = y + (h - sz.y); + } } - if (m_sides & wxEAST) + + item->SetDimension(pt, sz); +} + +//--------------------------------------------------------------------------- +// wxFlexGridSizer +//--------------------------------------------------------------------------- + +wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap ) + : wxGridSizer( rows, cols, vgap, hgap ) +{ + m_rowHeights = (int*) NULL; + m_colWidths = (int*) NULL; +} + +wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap ) + : wxGridSizer( cols, vgap, hgap ) +{ + m_rowHeights = (int*) NULL; + m_colWidths = (int*) NULL; +} + +wxFlexGridSizer::~wxFlexGridSizer() +{ + if (m_rowHeights) + delete[] m_rowHeights; + if (m_colWidths) + delete[] m_colWidths; +} + +void wxFlexGridSizer::CreateArrays() +{ + if (m_rowHeights) + delete[] m_rowHeights; + if (m_colWidths) + delete[] m_colWidths; + + if (m_children.GetCount() == 0) + return; + + int nitems = m_children.GetCount(); + int nrows = m_rows; + int ncols = m_cols; + + if (ncols > 0) + nrows = (nitems + ncols-1) / ncols; + else + ncols = (nitems + nrows-1) / nrows; + + m_rowHeights = new int[nrows]; + m_colWidths = new int[ncols]; + + for (int col = 0; col < ncols; col++) + m_colWidths[ col ] = 0; + for (int row = 0; row < nrows; row++) + m_rowHeights[ row ] = 0; +} + +void wxFlexGridSizer::RecalcSizes() +{ + if (m_children.GetCount() == 0) + return; + + int nitems = m_children.GetCount(); + int nrows = m_rows; + int ncols = m_cols; + + if (ncols > 0) + nrows = (nitems + ncols-1) / ncols; + else + ncols = (nitems + nrows-1) / nrows; + + wxSize sz( GetSize() ); + wxSize minsz( CalcMin() ); + wxPoint pt( GetPosition() ); + int delta; + size_t idx; + + if ((m_growableRows.GetCount() > 0) && (sz.y > minsz.y)) { - size.x -= borderSize; + delta = (sz.y - minsz.y) / m_growableRows.GetCount(); + for (idx = 0; idx < m_growableRows.GetCount(); idx++) + m_rowHeights[ m_growableRows[idx] ] += delta; } - if (m_sides & wxNORTH) + + if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x)) { - size.y -= borderSize; - pt.y += borderSize; + delta = (sz.x - minsz.x) / m_growableCols.GetCount(); + for (idx = 0; idx < m_growableCols.GetCount(); idx++) + m_colWidths[ m_growableCols[idx] ] += delta; } - if (m_sides & wxSOUTH) + + sz = wxSize( pt.x + sz.x, pt.y + sz.y ); + + int x = pt.x; + for (int c = 0; c < ncols; c++) { - size.y -= borderSize; + int y = pt.y; + for (int r = 0; r < nrows; r++) + { + int i = r * ncols + c; + if (i < nitems) + { + wxNode *node = m_children.Nth( i ); + wxASSERT( node ); + + int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) ); + int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) ); + + SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); + } + y = y + m_rowHeights[r] + m_vgap; + } + x = x + m_colWidths[c] + m_hgap; } - - item->SetDimension( pt, size ); } -wxSize wxBorderNewSizer::CalcMin() +wxSize wxFlexGridSizer::CalcMin() +{ + if (m_children.GetCount() == 0) + return wxSize(10,10); + + int nitems = m_children.GetCount(); + int nrows = m_rows; + int ncols = m_cols; + + if (ncols > 0) + nrows = (nitems + ncols-1) / ncols; + else + ncols = (nitems + nrows-1) / nrows; + + CreateArrays(); + + int col; + int row; + + int i = 0; + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSize sz( item->CalcMin() ); + row = i / ncols; + col = i % ncols; + m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] ); + m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] ); + + node = node->Next(); + i++; + } + + int width = 0; + for (col = 0; col < ncols; col++) + width += m_colWidths[ col ]; + + int height = 0; + for (row = 0; row < nrows; row++) + height += m_rowHeights[ row ]; + + return wxSize( width + (ncols-1) * m_hgap, + height + (nrows-1) * m_vgap); +} + +void wxFlexGridSizer::AddGrowableRow( size_t idx ) +{ + m_growableRows.Add( idx ); +} + +void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) ) +{ +} + +void wxFlexGridSizer::AddGrowableCol( size_t idx ) +{ + m_growableCols.Add( idx ); +} + +void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) ) { - wxNode *node = m_children.GetFirst(); - - if (!node) - return wxSize(2,2); - - wxNewSizerItem *item = (wxNewSizerItem*) node->Data(); - - wxSize size( item->CalcMin() ); - - int borderSize = item->GetOption(); - - if (m_sides & wxWEST) - size.x += borderSize; - if (m_sides & wxEAST) - size.x += borderSize; - if (m_sides & wxNORTH) - size.y += borderSize; - if (m_sides & wxSOUTH) - size.y += borderSize; - - return size; } //--------------------------------------------------------------------------- -// wxBoxNewSizer +// wxBoxSizer //--------------------------------------------------------------------------- -wxBoxNewSizer::wxBoxNewSizer( int orient ) +wxBoxSizer::wxBoxSizer( int orient ) { m_orient = orient; } -void wxBoxNewSizer::RecalcSizes() +void wxBoxSizer::RecalcSizes() { if (m_children.GetCount() == 0) - { - SetDimension( m_position.x, m_position.y, 2, 2 ); return; - } - + int delta = 0; int extra = 0; if (m_stretchable) @@ -276,110 +854,252 @@ void wxBoxNewSizer::RecalcSizes() { delta = (m_size.x - m_fixedWidth) / m_stretchable; extra = (m_size.x - m_fixedWidth) % m_stretchable; - } - else - { + } + else + { delta = (m_size.y - m_fixedHeight) / m_stretchable; extra = (m_size.y - m_fixedHeight) % m_stretchable; - } + } } - + wxPoint pt( m_position ); - + wxNode *node = m_children.GetFirst(); while (node) { - wxNewSizerItem *item = (wxNewSizerItem*) node->Data(); - - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); - - wxSize size( item->CalcMin() ); - - if (m_orient == wxVERTICAL) - { - long height = size.y; - if (item->GetOption()) - { - height = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size - } - item->SetDimension( pt, wxSize( size.x, height) ); - pt.y += height; - } - else - { - long width = size.x; - if (item->GetOption()) - { - width = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size - } - item->SetDimension( pt, wxSize(width, size.y) ); - pt.x += width; - } - - node = node->Next(); + wxSizerItem *item = (wxSizerItem*) node->Data(); + + int weight = 1; + if (item->GetOption()) + weight = item->GetOption(); + + wxSize size( item->CalcMin() ); + + if (m_orient == wxVERTICAL) + { + wxCoord height = size.y; + if (item->GetOption()) + { + height = (delta * weight) + extra; + extra = 0; // only the first item will get the remainder as extra size + } + + wxPoint child_pos( pt ); + wxSize child_size( wxSize( size.x, height) ); + + if (item->GetFlag() & (wxEXPAND | wxSHAPED)) + child_size.x = m_size.x; + else if (item->GetFlag() & wxALIGN_RIGHT) + child_pos.x += m_size.x - size.x; + else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL)) + // XXX wxCENTER is added for backward compatibility; + // wxALIGN_CENTER should be used in new code + child_pos.x += (m_size.x - size.x) / 2; + + item->SetDimension( child_pos, child_size ); + + pt.y += height; + } + else + { + wxCoord width = size.x; + if (item->GetOption()) + { + width = (delta * weight) + extra; + extra = 0; // only the first item will get the remainder as extra size + } + + wxPoint child_pos( pt ); + wxSize child_size( wxSize(width, size.y) ); + + if (item->GetFlag() & (wxEXPAND | wxSHAPED)) + child_size.y = m_size.y; + else if (item->GetFlag() & wxALIGN_BOTTOM) + child_pos.y += m_size.y - size.y; + else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL)) + // XXX wxCENTER is added for backward compatibility; + // wxALIGN_CENTER should be used in new code + child_pos.y += (m_size.y - size.y) / 2; + + item->SetDimension( child_pos, child_size ); + + pt.x += width; + } + + node = node->Next(); } } -wxSize wxBoxNewSizer::CalcMin() +wxSize wxBoxSizer::CalcMin() { if (m_children.GetCount() == 0) - return wxSize(2,2); - + return wxSize(10,10); + m_stretchable = 0; m_minWidth = 0; m_minHeight = 0; m_fixedWidth = 0; m_fixedHeight = 0; - + wxNode *node = m_children.GetFirst(); while (node) { - wxNewSizerItem *item = (wxNewSizerItem*) node->Data(); - - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); - - wxSize size( item->CalcMin() ); - - if (m_orient == wxHORIZONTAL) - { - m_minWidth += (size.x * weight); - m_minHeight = wxMax( m_minHeight, size.y ); - } - else - { - m_minHeight += (size.y * weight); - m_minWidth = wxMax( m_minWidth, size.x ); - } - - if (item->GetOption()) - { - m_stretchable += weight; - } - else - { - if (m_orient == wxVERTICAL) - { - m_fixedHeight += size.y; - m_fixedWidth = wxMax( m_fixedWidth, size.x ); - } - else - { - m_fixedWidth += size.x; - m_fixedHeight = wxMax( m_fixedHeight, size.y ); - } - } - - node = node->Next(); + wxSizerItem *item = (wxSizerItem*) node->Data(); + + m_stretchable += item->GetOption(); + + wxSize size( item->CalcMin() ); + + if (m_orient == wxHORIZONTAL) + { + m_minWidth += size.x; + m_minHeight = wxMax( m_minHeight, size.y ); + } + else + { + m_minHeight += size.y; + m_minWidth = wxMax( m_minWidth, size.x ); + } + + if (item->GetOption() == 0) + { + if (m_orient == wxVERTICAL) + { + m_fixedHeight += size.y; + m_fixedWidth = wxMax( m_fixedWidth, size.x ); + } + else + { + m_fixedWidth += size.x; + m_fixedHeight = wxMax( m_fixedHeight, size.y ); + } + } + + node = node->Next(); } - + return wxSize( m_minWidth, m_minHeight ); } -#endif - // __SIZERS_H__ +//--------------------------------------------------------------------------- +// wxStaticBoxSizer +//--------------------------------------------------------------------------- + +wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) + : wxBoxSizer( orient ) +{ + wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") ); + + m_staticBox = box; +} + +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 +#ifdef __WXGTK__ + if ( box->GetLabel().IsEmpty() ) + *borderTop = 5; + else +#endif // __WXGTK__ + *borderTop = 15; + + *borderOther = 5; +} + +void wxStaticBoxSizer::RecalcSizes() +{ + int top_border, other_border; + GetStaticBoxBorders(m_staticBox, &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; + + wxBoxSizer::RecalcSizes(); + + m_position = old_pos; + m_size = old_size; +} + +wxSize wxStaticBoxSizer::CalcMin() +{ + int top_border, other_border; + GetStaticBoxBorders(m_staticBox, &top_border, &other_border); + + wxSize ret( wxBoxSizer::CalcMin() ); + ret.x += 2*other_border; + ret.y += other_border + top_border; + + return ret; +} + +//--------------------------------------------------------------------------- +// wxNotebookSizer +//--------------------------------------------------------------------------- + +#if wxUSE_NOTEBOOK + +wxNotebookSizer::wxNotebookSizer( wxNotebook *nb ) +{ + wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") ); + + m_notebook = nb; +} + +void wxNotebookSizer::RecalcSizes() +{ + m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); +} + +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. + + 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.. + } + + if (m_notebook->GetChildren().GetCount() == 0) + return wxSize(borderX + 10, borderY + 10); + + int maxX = 0; + int maxY = 0; + + wxWindowList::Node *node = m_notebook->GetChildren().GetFirst(); + while (node) + { + wxWindow *item = node->GetData(); + wxSizer *itemsizer = item->GetSizer(); + + if (itemsizer) + { + wxSize subsize( itemsizer->CalcMin() ); + + if (subsize.x > maxX) maxX = subsize.x; + if (subsize.y > maxY) maxY = subsize.y; + } + + node = node->GetNext(); + } + + return wxSize( borderX + maxX, borderY + maxY ); +} + +#endif // wxUSE_NOTEBOOK