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);
+ if ((m_flag & wxSHAPED) && !m_ratio)
+ SetRatio(ret);
}
-
-/*
- The minimum size of a window should be the
- initial size, as saved in m_minSize, not the
- current size.
-
else
- if (IsWindow())
- ret = m_window->GetSize();
-*/
- else ret = m_minSize;
+ {
+ 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;
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
- 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)
+ if (m_flag & wxSHAPED)
{
- size.y -= m_border;
- }
- if (m_flag & wxSHAPED) {
// adjust aspect ratio
int rwidth = (int) (size.y * m_ratio);
- if (rwidth > size.x) {
+ if (rwidth > size.x)
+ {
// fit horizontally
int rheight = (int) (size.x / m_ratio);
// add vertical space
pos.y += (size.y - rheight);
// use reduced dimensions
size.y =rheight;
- } else if (rwidth < size.x) {
+ }
+ else if (rwidth < size.x)
+ {
// add horizontal space
if (m_flag & wxALIGN_CENTER_HORIZONTAL)
pos.x += (size.x - rwidth) / 2;
}
}
+ // 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 );
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 wxSizer::Layout()
void wxSizer::SetSizeHints( wxWindow *window )
{
- wxSize size( GetMinWindowSize( window ) );
+ wxSize size = FitSize( window );
window->SetSizeHints( size.x, size.y );
}
+wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
+{
+ wxRect rect = wxGetClientDisplayRect();
+ wxSize sizeMax (rect.width,rect.height);
+
+ // Make the max size a bit smaller than the visible portion of
+ // the screen. A window which takes the entire screen doesn't
+ // look very nice either
+ sizeMax.x *= 9;
+ sizeMax.x /= 10;
+
+ sizeMax.y *= 9;
+ sizeMax.y /= 10;
+
+ return sizeMax;
+}
+
wxSize wxSizer::GetMinWindowSize( wxWindow *window )
{
wxSize minSize( GetMinSize() );
minSize.y+size.y-client_size.y );
}
+// 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_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();
- int weight = 1;
- if (item->GetOption())
- weight = item->GetOption();
+ 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)
{
- m_minWidth += (size.x * weight);
+ m_minWidth += size.x;
m_minHeight = wxMax( m_minHeight, size.y );
}
else
{
- m_minHeight += (size.y * weight);
+ m_minHeight += size.y;
m_minWidth = wxMax( m_minWidth, size.x );
}
- if (item->GetOption())
- {
- m_stretchable += weight;
- }
- else
+ if (item->GetOption() == 0)
{
if (m_orient == wxVERTICAL)
{
//---------------------------------------------------------------------------
wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
- : wxBoxSizer( 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;
+ (void)box;
+ *borderOther = 5;
+}
+
void wxStaticBoxSizer::RecalcSizes()
{
- // this will have to be done platform by platform
- // as there is no way to guess the thickness of
- // a wxStaticBox border
- int top_border = 15;
- if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
- int other_border = 5;
+ 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 );
wxSize wxStaticBoxSizer::CalcMin()
{
- // This will have to be done platform by platform
- // as there is no way to guess the thickness of
- // a wxStaticBox border.
-
- int top_border = 15;
- if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
- int other_border = 5;
+ int top_border, other_border;
+ GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
wxSize ret( wxBoxSizer::CalcMin() );
ret.x += 2*other_border;
projects / wxWidgets.git / blobdiff