ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sizing issues and others

Browse source
This commit is contained in:
IlyaShurupov 2024-10-11 01:48:21 +03:00
parent b2c393d23a
commit e9a4801d9e
12 changed files with 325 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

38
WidgetsNew/examples/Example.cpp
View file

@ -8,10 +8,20 @@
using namespace tp;
/*
* adjust child widgets in the layout view
* make scrollable area
* change Widget::clampMinMax function to include child enclosure
* refactor all sizing in Widget -> move to separate files
* refactor root widget -> reorganize code
*/
class WidgetApplication : public Application {
public:
WidgetApplication() {
setup2();
setup1();
}
void setup1() {
@ -52,6 +62,21 @@ public:
// mLayoutWidget.addChild(&mLabel);
}
void setup3() {
mRootWidget.setRootWidget(&mDesktopLayout);
mDesktopLayout.addChild(&mFloatingWidget);
mFloatingWidget.addChild(&mButton);
mFloatingWidget.addChild(&mButton2);
mFloatingWidget.addChild(&mButton3);
mButton.setSizePolicy(Widget::SizePolicy::Minimal, Widget::SizePolicy::Expanding);
mButton2.setSizePolicy(Widget::SizePolicy::Minimal, Widget::SizePolicy::Expanding);
mButton3.setSizePolicy(Widget::SizePolicy::Expanding, Widget::SizePolicy::Expanding);
RootWidget::setWidgetArea(mFloatingWidget, { 100, 100, 400, 400 });
}
void setup2() {
mRootWidget.setRootWidget(&mDesktopLayout);
mDesktopLayout.addChild(&mWidget);
@ -60,17 +85,17 @@ public:
mWidget.addChild(&mButton2);
mWidget.addChild(&mButton3);
mButton.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
mButton2.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
mButton3.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
mButton.setSizePolicy(Widget::SizePolicy::Expanding, Widget::SizePolicy::Minimal);
mButton2.setSizePolicy(Widget::SizePolicy::Expanding, Widget::SizePolicy::Minimal);
mButton3.setSizePolicy(Widget::SizePolicy::Expanding, Widget::SizePolicy::Minimal);
mWidget.setSizePolicy(Widget::SizePolicy::Contract, Widget::SizePolicy::Contract);
mWidget.setSizePolicy(Widget::SizePolicy::Minimal, Widget::SizePolicy::Minimal);
mWidget.setLayoutPolicy(Widget::LayoutPolicy::Horizontally);
mButton.setAction([this]() { mButton2.setMinSize(mButton2.getMinSize() + 10); });
mButton2.setAction([this]() { mButton.setMinSize(mButton.getMinSize() + 10); } );
RootWidget::setWidgetArea(mWidget, { 300, 100, 150, 200 });
RootWidget::setWidgetArea(mWidget, { 400, 100, 150, 200 });
}
void processFrame(EventHandler* eventHandler, halnf deltaTime) override {
@ -96,6 +121,7 @@ private:
ButtonWidget mButton3;
ButtonWidget mButton4;
FloatingWidget mFloatingWidget;
FloatingMenu mFloatingMenu;
FloatingMenu mFloatingMenu2;