mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-03-24 03:13:13 +08:00
11a8ed6cbb
The functions InformFirstDirection() in wxWindow and wxSizer forced the code overriding it to be written in unnatural way, by storing the parameters passed to this function and then using them in other functions later. Add new functions wxWindow::GetMinSizeFromKnownDirection() and wxSizer::CalcMinSizeFromKnownDirection() taking the same parameters as InformFirstDirection() but which can use them directly to return the desired result. Change wxStaticText and wxWrapSizer to use them instead of the old function to simplify their code (that of wxWrapSizer could probably be still simplified further, as it doesn't seem necessary to store these values at all any longer, but for now keep it as is).
126 lines
4.2 KiB
C++
126 lines
4.2 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/sizers/wrapsizer.cpp
|
|
// Purpose: Unit tests for wxWrapSizer
|
|
// Author: Catalin Raceanu
|
|
// Created: 2010-10-23
|
|
// Copyright: (c) 2010 wxWidgets development team
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "testprec.h"
|
|
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/app.h"
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "wx/wrapsizer.h"
|
|
|
|
#include "asserthelper.h"
|
|
|
|
#include <memory>
|
|
|
|
TEST_CASE("wxWrapSizer::CalcMin", "[wxWrapSizer]")
|
|
{
|
|
std::unique_ptr<wxWindow> win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY));
|
|
win->SetClientSize(180, 240);
|
|
|
|
wxSizer *sizer = new wxWrapSizer(wxHORIZONTAL);
|
|
win->SetSizer(sizer);
|
|
|
|
wxSize sizeMinExpected;
|
|
|
|
auto const checkSizeIsExpected = [&](const char* desc)
|
|
{
|
|
INFO(desc);
|
|
CHECK( sizer->CalcMinSizeFromKnownDirection
|
|
(
|
|
wxHORIZONTAL,
|
|
win->GetClientSize().x,
|
|
win->GetClientSize().y
|
|
) == sizeMinExpected );
|
|
};
|
|
|
|
// With a single child the min size must be the same as child size.
|
|
const wxSize sizeChild1 = wxSize(80, 60);
|
|
sizeMinExpected = sizeChild1;
|
|
|
|
wxWindow * const
|
|
child1 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild1);
|
|
child1->SetBackgroundColour(*wxRED);
|
|
sizer->Add(child1);
|
|
win->Layout();
|
|
|
|
checkSizeIsExpected("Single child");
|
|
|
|
// If both children can fit in the same row, the minimal size of the sizer
|
|
// is determined by the sum of their minimal horizontal dimensions and
|
|
// the maximum of their minimal vertical dimensions.
|
|
const wxSize sizeChild2 = wxSize(100, 80);
|
|
sizeMinExpected.x += sizeChild2.x;
|
|
sizeMinExpected.y = wxMax(sizeChild1.y, sizeChild2.y);
|
|
|
|
wxWindow * const
|
|
child2 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild2);
|
|
child2->SetBackgroundColour(*wxYELLOW);
|
|
sizer->Add(child2);
|
|
win->Layout();
|
|
|
|
checkSizeIsExpected("Two children in one row");
|
|
|
|
// Three children will take at least two rows so the minimal size in
|
|
// vertical direction must increase.
|
|
const wxSize sizeChild3 = wxSize(90, 40);
|
|
sizeMinExpected.y += sizeChild3.y;
|
|
|
|
wxWindow * const
|
|
child3 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild3);
|
|
child3->SetBackgroundColour(*wxGREEN);
|
|
sizer->Add(child3);
|
|
win->Layout();
|
|
|
|
checkSizeIsExpected("Three children in two rows");
|
|
}
|
|
|
|
TEST_CASE("wxWrapSizer::CalcMinFromMinor", "[wxWrapSizer]")
|
|
{
|
|
std::unique_ptr<wxWindow> win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY));
|
|
win->SetClientSize(180, 240);
|
|
|
|
wxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
win->SetSizer(boxSizer);
|
|
|
|
// To test CalcMinFromMinor function the wrap sizer with the
|
|
// horizonral align added to the box sizer with horizontal align.
|
|
wxSizer* wrapSizer = new wxWrapSizer(wxHORIZONTAL);
|
|
boxSizer->Add(wrapSizer);
|
|
|
|
// Add three child windows. Sum of the first and the second windows widths should
|
|
// be less than the width of the third window.
|
|
const wxSize sizeChild1 = wxSize(40, 60);
|
|
wxWindow * const
|
|
child1 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild1);
|
|
child1->SetBackgroundColour(*wxRED);
|
|
wrapSizer->Add(child1);
|
|
|
|
const wxSize sizeChild2 = wxSize(50, 80);
|
|
wxWindow * const
|
|
child2 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild2);
|
|
child2->SetBackgroundColour(*wxGREEN);
|
|
wrapSizer->Add(child2);
|
|
|
|
const wxSize sizeChild3 = wxSize(100, 120);
|
|
wxWindow * const
|
|
child3 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild3);
|
|
child3->SetBackgroundColour(*wxBLUE);
|
|
wrapSizer->Add(child3);
|
|
|
|
// First two windows should be in a first row and the third in a second row.
|
|
const wxSize sizeMinExpected = wxSize(sizeChild3.x, sizeChild2.y + sizeChild3.y);
|
|
win->Layout();
|
|
CHECK(sizeMinExpected == wrapSizer->CalcMin());
|
|
}
|