diff --git a/WidgetsNew/examples/Example.cpp b/WidgetsNew/examples/Example.cpp index 20c8005..273a7df 100644 --- a/WidgetsNew/examples/Example.cpp +++ b/WidgetsNew/examples/Example.cpp @@ -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); diff --git a/WidgetsNew/private/DockLayoutWidget.cpp b/WidgetsNew/private/DockLayoutWidget.cpp index 5b39cd4..5c717a6 100644 --- a/WidgetsNew/private/DockLayoutWidget.cpp +++ b/WidgetsNew/private/DockLayoutWidget.cpp @@ -204,7 +204,7 @@ void DockLayoutWidget::handleResizeEvents(const EventHandler& events) { sideWidget.resizeHandle.active = true; mResizing = true; - triggerWidgetUpdate(); + triggerWidgetUpdate(); } } } diff --git a/WidgetsNew/private/RootWidget.cpp b/WidgetsNew/private/RootWidget.cpp index ecb714f..4562c75 100644 --- a/WidgetsNew/private/RootWidget.cpp +++ b/WidgetsNew/private/RootWidget.cpp @@ -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) { diff --git a/WidgetsNew/private/Widget.cpp b/WidgetsNew/private/Widget.cpp index 2da4239..8f0eccb 100644 --- a/WidgetsNew/private/Widget.cpp +++ b/WidgetsNew/private/Widget.cpp @@ -50,7 +50,7 @@ void Widget::updateAnimations() { } bool Widget::needsNextFrame() const { - return !mArea.shouldEndTransition() || mInFocus; + return !mArea.shouldEndTransition(); } void Widget::adjustRect() { diff --git a/WidgetsNew/public/SimpleWidgets.hpp b/WidgetsNew/public/SimpleWidgets.hpp index e767a0a..214ea8c 100644 --- a/WidgetsNew/public/SimpleWidgets.hpp +++ b/WidgetsNew/public/SimpleWidgets.hpp @@ -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 }; }; } \ No newline at end of file