Refactor fixes

This commit is contained in:
IlyaShurupov 2024-10-09 19:36:17 +03:00
parent 4ad40058f9
commit e028ad1a41
5 changed files with 12 additions and 4 deletions

View file

@ -11,6 +11,10 @@ using namespace tp;
class WidgetApplication : public Application {
public:
WidgetApplication() {
setup1();
}
void setup1() {
mRootWidget.setRootWidget(&mDockLayout);
mDockLayout.addChild(&mFloatingMenu);
@ -43,6 +47,10 @@ public:
// mLayoutWidget.addChild(&mLabel);
}
void setup2() {
mRootWidget.setRootWidget(&mLabel);
}
void processFrame(EventHandler* eventHandler, halnf deltaTime) override {
const auto rec = RectF({ 0, 0 }, mWindow->getSize());
mRootWidget.processFrame(eventHandler, rec);

View file

@ -204,7 +204,7 @@ void DockLayoutWidget::handleResizeEvents(const EventHandler& events) {
sideWidget.resizeHandle.active = true;
mResizing = true;
triggerWidgetUpdate();
triggerWidgetUpdate();
}
}
}

View file

@ -34,7 +34,7 @@ void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
adjustSizes(root);
// trigger some widgets by moise pointer
handleFocusChanges(*events);
handleFocusChanges(*events);
// check triggered widgets for removal
erase_if(mTriggeredWidgets, [this](auto widget) {

View file

@ -50,7 +50,7 @@ void Widget::updateAnimations() {
}
bool Widget::needsNextFrame() const {
return !mArea.shouldEndTransition() || mInFocus;
return !mArea.shouldEndTransition();
}
void Widget::adjustRect() {

View file

@ -54,6 +54,6 @@ namespace tp {
halnf mRounding = 5;
RGBA mColorHovered = { 0.0f, 0.4f, 0.4f, 1.f };
RGBA mColor = { 0.0f, 0.0f, 0.0f, 1.f };
RGBA mColor = { 0.13f, 0.13f, 0.13f, 1.f };
};
}