// 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
}
}
-void wxSizer::Fit( wxWindow *window )
+wxSize wxSizer::Fit( wxWindow *window )
{
wxSize size;
if (window->IsTopLevel())
else
size = GetMinWindowSize( window );
- window->SetClientSize( size );
+ 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()
// Preserve the window's max size hints, but set the
// lower bound according to the sizer calculations.
- wxSize size = FitSize( window );
+ wxSize size = Fit( window );
+
window->SetSizeHints( size.x,
size.y,
window->GetMaxWidth(),
window->GetMaxHeight() );
}
+void wxSizer::SetVirtualSizeHints( wxWindow *window )
+{
+ // 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() );
+}
+
wxSize wxSizer::GetMaxWindowSize( wxWindow *window )
{
return window->GetMaxSize();
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;
+}
+
void wxSizer::SetDimension( int x, int y, int width, int height )
{
m_position.x = x;
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer())
{
- /* It's a sizer, so lets search recursively. */
+ // It's a sizer, so lets search recursively.
if (item->GetSizer()->DoSetItemMinSize( window, width, height ))
{
- /* A child sizer found the requested windw, exit. */
+ // A child sizer found the requested windw, exit.
return TRUE;
}
}
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer())
{
- /* It's a sizer, so lets search recursively. */
+ // It's a sizer, so lets search recursively.
if (item->GetSizer()->DoSetItemMinSize( sizer, width, height ))
{
- /* A child sizer found the requested windw, exit. */
+ // A child sizer found the requested windw, exit.
return TRUE;
}
}
wxSizerItem *item = (wxSizerItem*) node->Data();
if (item->GetSizer())
{
- /* Sizers contains the minimal size in them, if not calculated ... */
+ // 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 */
+ // ... but the minimal size of spacers and windows in stored in them
item->SetInitSize( width, height );
}
m_hgap = hgap;
}
-void wxGridSizer::RecalcSizes()
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
{
- if (m_children.GetCount() == 0)
- return;
-
int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
+ if ( nitems)
+ {
+ 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") );
- if (ncols > 0)
- nrows = (nitems + ncols-1) / ncols;
- else
- ncols = (nitems + nrows-1) / nrows;
+ nrows = ncols = 0;
+ }
+ }
+
+ return nitems;
+}
+
+void wxGridSizer::RecalcSizes()
+{
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ return;
wxSize sz( GetSize() );
wxPoint pt( GetPosition() );
wxSize wxGridSizer::CalcMin()
{
- if (m_children.GetCount() == 0)
- return wxSize(10,10);
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 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 */
+ // Find the max width and height for any component
int w = 0;
int h = 0;
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;
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ {
+ m_rowHeights =
+ m_colWidths = NULL;
+ }
m_rowHeights = new int[nrows];
m_colWidths = new int[ncols];
void wxFlexGridSizer::RecalcSizes()
{
- if (m_children.GetCount() == 0)
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 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_t idx,num;
+ wxArrayInt temp;
+
+ // Transfer only those rows into temp which exist in the sizer
+ // ignoring the superflouus ones. This prevents a segfault when
+ // calling AddGrowableRow( 3 ) if the sizer only has 2 rows.
+ for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+ if (m_growableRows[idx] < nrows)
+ temp.Add( m_growableRows[idx] );
+ num = temp.GetCount();
+
+ if ((num > 0) && (sz.y > minsz.y))
{
- delta = (sz.y - minsz.y) / m_growableRows.GetCount();
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
- m_rowHeights[ m_growableRows[idx] ] += delta;
+ delta = (sz.y - minsz.y) / num;
+ for (idx = 0; idx < num; idx++)
+ m_rowHeights[ temp[idx] ] += delta;
}
- if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x))
+ temp.Empty();
+ // See above
+ for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+ if (m_growableCols[idx] < ncols)
+ temp.Add( m_growableCols[idx] );
+ num = temp.GetCount();
+
+ if ((num > 0) && (sz.x > minsz.x))
{
- delta = (sz.x - minsz.x) / m_growableCols.GetCount();
- for (idx = 0; idx < m_growableCols.GetCount(); idx++)
- m_colWidths[ m_growableCols[idx] ] += delta;
+ delta = (sz.x - minsz.x) / num;
+ for (idx = 0; idx < num; idx++)
+ m_colWidths[ temp[idx] ] += delta;
}
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
wxSize wxFlexGridSizer::CalcMin()
{
- if (m_children.GetCount() == 0)
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 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;
+ int row = i / ncols;
+ int col = i % ncols;
m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
}
int width = 0;
- for (col = 0; col < ncols; col++)
+ for (int col = 0; col < ncols; col++)
width += m_colWidths[ col ];
int height = 0;
- for (row = 0; row < nrows; row++)
+ for (int row = 0; row < nrows; row++)
height += m_rowHeights[ row ];
return wxSize( width + (ncols-1) * m_hgap,
}
node = node->Next();
}
- // Calculate overall minimum size
- node = m_children.GetFirst();
+ // Calculate overall minimum size
+ node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = (wxSizerItem*) node->Data();
else
#endif // __WXGTK__
*borderTop = 15;
- (void)box;
+ (void)box;
*borderOther = 5;
}
projects / wxWidgets.git / blobdiff