4b57475e58
Setting wxFLEX_GROWMODE_ALL for the non-flexible direction broke handling of proportions in the flexible direction which were unexpectedly not taken into account at all any more due to not passing them to DoAdjustForGrowables(). Fix this by still respecting the proportions in this case and add a test case to ensure this doesn't get broken again. See #23251, #23253. (cherry picked from commit 6bfabd7afe16ed734565635228d540cb47b16970)
216 lines
7.3 KiB
C++
216 lines
7.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/sizers/gridsizer.cpp
|
|
// Purpose: Unit tests for wxGridSizer and wxFlexGridSizer.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2015-04-03
|
|
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "testprec.h"
|
|
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/app.h"
|
|
#include "wx/sizer.h"
|
|
#include "wx/vector.h"
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "asserthelper.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// test class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class GridSizerTestCase
|
|
{
|
|
protected:
|
|
GridSizerTestCase();
|
|
~GridSizerTestCase();
|
|
// Clear the current sizer contents and add the specified windows to it,
|
|
// using the same flags for all of them.
|
|
void SetChildren(const wxVector<wxWindow*>& children,
|
|
const wxSizerFlags& flags);
|
|
|
|
wxWindow *m_win;
|
|
wxFlexGridSizer *m_sizer;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(GridSizerTestCase);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// test initialization
|
|
// ----------------------------------------------------------------------------
|
|
|
|
GridSizerTestCase::GridSizerTestCase()
|
|
{
|
|
m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
|
|
m_win->SetClientSize(127, 35);
|
|
|
|
m_sizer = new wxFlexGridSizer(2);
|
|
m_win->SetSizer(m_sizer);
|
|
}
|
|
|
|
GridSizerTestCase::~GridSizerTestCase()
|
|
{
|
|
delete m_win;
|
|
m_win = NULL;
|
|
|
|
m_sizer = NULL;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// helpers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
void GridSizerTestCase::SetChildren(const wxVector<wxWindow*>& children,
|
|
const wxSizerFlags& flags)
|
|
{
|
|
m_sizer->Clear();
|
|
for ( wxVector<wxWindow*>::const_iterator i = children.begin();
|
|
i != children.end();
|
|
++i )
|
|
{
|
|
m_sizer->Add(*i, flags);
|
|
}
|
|
|
|
m_win->Layout();
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// tests themselves
|
|
// ----------------------------------------------------------------------------
|
|
|
|
TEST_CASE_METHOD(GridSizerTestCase,
|
|
"wxGridSizer::Layout",
|
|
"[grid-sizer][sizer]")
|
|
{
|
|
const wxSize sizeTotal = m_win->GetClientSize();
|
|
const wxSize sizeChild(sizeTotal.x / 4, sizeTotal.y / 4);
|
|
const wxSize sizeRest(sizeTotal.x - sizeTotal.x / 4,
|
|
sizeTotal.y - sizeTotal.y / 4);
|
|
|
|
wxVector<wxWindow*> children;
|
|
for ( int n = 0; n < 4; n++ )
|
|
{
|
|
children.push_back(new wxWindow(m_win, wxID_ANY, wxDefaultPosition,
|
|
sizeChild));
|
|
}
|
|
|
|
m_sizer->AddGrowableRow(1);
|
|
m_sizer->AddGrowableCol(1);
|
|
|
|
// Without Expand() windows have their initial size.
|
|
SECTION("No flags")
|
|
{
|
|
SetChildren(children, wxSizerFlags());
|
|
CHECK( children[0]->GetSize() == sizeChild );
|
|
CHECK( children[1]->GetSize() == sizeChild );
|
|
CHECK( children[2]->GetSize() == sizeChild );
|
|
CHECK( children[3]->GetSize() == sizeChild );
|
|
}
|
|
|
|
// With just expand, they expand to fill the entire column and the row
|
|
// containing them (which may or not expand on its own).
|
|
SECTION("Expand")
|
|
{
|
|
SetChildren(children, wxSizerFlags().Expand());
|
|
CHECK( children[0]->GetSize() == sizeChild );
|
|
CHECK( children[1]->GetSize() == wxSize(sizeRest.x, sizeChild.y) );
|
|
CHECK( children[2]->GetSize() == wxSize(sizeChild.x, sizeRest.y) );
|
|
CHECK( children[3]->GetSize() == sizeRest );
|
|
}
|
|
|
|
// With expand and another alignment flag, they should expand only in the
|
|
// direction in which the alignment is not given.
|
|
SECTION("Expand and center vertically")
|
|
{
|
|
SetChildren(children, wxSizerFlags().Expand().CentreVertical());
|
|
CHECK( children[0]->GetSize() == sizeChild );
|
|
CHECK( children[1]->GetSize() == wxSize(sizeRest.x, sizeChild.y) );
|
|
CHECK( children[2]->GetSize() == sizeChild );
|
|
CHECK( children[3]->GetSize() == wxSize(sizeRest.x, sizeChild.y) );
|
|
}
|
|
|
|
// Same as above but mirrored.
|
|
SECTION("Expand and center horizontally")
|
|
{
|
|
SetChildren(children, wxSizerFlags().Expand().CentreHorizontal());
|
|
CHECK( children[0]->GetSize() == sizeChild );
|
|
CHECK( children[1]->GetSize() == sizeChild );
|
|
CHECK( children[2]->GetSize() == wxSize(sizeChild.x, sizeRest.y) );
|
|
CHECK( children[3]->GetSize() == wxSize(sizeChild.x, sizeRest.y) );
|
|
}
|
|
|
|
// Test alignment flag too.
|
|
SECTION("Right align")
|
|
{
|
|
SetChildren(children, wxSizerFlags().Right());
|
|
CHECK( children[0]->GetPosition() == wxPoint( 0, 0) );
|
|
CHECK( children[1]->GetPosition() == wxPoint(sizeRest.x, 0) );
|
|
CHECK( children[2]->GetPosition() == wxPoint( 0, sizeChild.y) );
|
|
CHECK( children[3]->GetPosition() == wxPoint(sizeRest.x, sizeChild.y) );
|
|
}
|
|
|
|
// Also test combining centering in one direction and aligning in another.
|
|
SECTION("Right align and center vertically")
|
|
{
|
|
SetChildren(children, wxSizerFlags().Right().CentreVertical());
|
|
|
|
const int yMid = sizeChild.y + (sizeRest.y - sizeChild.y) / 2;
|
|
|
|
CHECK( children[0]->GetPosition() == wxPoint( 0, 0) );
|
|
CHECK( children[1]->GetPosition() == wxPoint(sizeRest.x, 0) );
|
|
CHECK( children[2]->GetPosition() == wxPoint( 0, yMid) );
|
|
CHECK( children[3]->GetPosition() == wxPoint(sizeRest.x, yMid) );
|
|
}
|
|
}
|
|
|
|
TEST_CASE_METHOD(GridSizerTestCase,
|
|
"wxGridSizer::IncompatibleFlags",
|
|
"[grid-sizer][sizer]")
|
|
{
|
|
WX_ASSERT_FAILS_WITH_ASSERT_MESSAGE
|
|
(
|
|
"Combining wxEXPAND and wxCENTRE should assert",
|
|
m_sizer->Add(10, 10, wxSizerFlags().Expand().Centre())
|
|
);
|
|
}
|
|
|
|
TEST_CASE_METHOD(GridSizerTestCase,
|
|
"wxGridSizer::GrowMode",
|
|
"[grid-sizer][sizer]")
|
|
{
|
|
wxVector<wxWindow*> children;
|
|
for ( int n = 0; n < 4; n++ )
|
|
{
|
|
children.push_back(new wxWindow(m_win, wxID_ANY));
|
|
}
|
|
|
|
// Proportions of growable columns should be respected.
|
|
m_sizer->AddGrowableCol(0, 1);
|
|
m_sizer->AddGrowableCol(1, 4);
|
|
|
|
// However proportions of growable rows should not because we use
|
|
// wxFLEX_GROWMODE_ALL which tells the sizer to grow all rows uniformly.
|
|
m_sizer->AddGrowableRow(0, 1);
|
|
m_sizer->AddGrowableRow(1, 4);
|
|
|
|
m_sizer->SetFlexibleDirection(wxHORIZONTAL);
|
|
m_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_ALL);
|
|
|
|
// Make both dimensions divisible by 5 to avoid dealing with extra pixels.
|
|
m_win->SetClientSize(100, 100);
|
|
|
|
SetChildren(children, wxSizerFlags().Expand());
|
|
|
|
// Check that we have different widths but same heights for all children.
|
|
CHECK( children[0]->GetSize() == wxSize(20, 50) );
|
|
CHECK( children[1]->GetSize() == wxSize(80, 50) );
|
|
CHECK( children[2]->GetSize() == wxSize(20, 50) );
|
|
CHECK( children[3]->GetSize() == wxSize(80, 50) );
|
|
}
|