diff --git a/Graphics/private/Window.cpp b/Graphics/private/Window.cpp index bcd01e5..3bf1bb6 100644 --- a/Graphics/private/Window.cpp +++ b/Graphics/private/Window.cpp @@ -64,7 +64,7 @@ Window* Window::createWindow(Vec2F size, const char* title) { } count--; - // glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); + glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); // glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR); // Initialize GLFW diff --git a/Widgets/private/FloatingWidget.cpp b/Widgets/private/FloatingWidget.cpp index e0f1cc6..eb2f060 100644 --- a/Widgets/private/FloatingWidget.cpp +++ b/Widgets/private/FloatingWidget.cpp @@ -41,7 +41,7 @@ void FloatingWidget::checkFloating(const Events& events) { mFloating = true; } - if (mFloating && this->mHeader.isReleased()) { + if (mFloating && isReleased()) { mFloating = false; this->mHeader.clearEvents(); } diff --git a/Widgets/private/WidgetBase.cpp b/Widgets/private/WidgetBase.cpp index 0d7d4d2..212e74e 100644 --- a/Widgets/private/WidgetBase.cpp +++ b/Widgets/private/WidgetBase.cpp @@ -86,7 +86,7 @@ void Widget::checkVisibility(const Events& events, const RectF& parentArea) { } void Widget::checkFocus(const Events& events) { - const bool currentFocus = mVisibleArea.isInside(events.getPointer()); + const bool currentFocus = mVisibleArea.isInside(events.getPointerPrev()); if (currentFocus != mInFocus) { if (currentFocus) eventFocusEnter(events); diff --git a/Widgets/private/WorkspaceWidget.cpp b/Widgets/private/WorkspaceWidget.cpp index b8b6993..6aa7345 100644 --- a/Widgets/private/WorkspaceWidget.cpp +++ b/Widgets/private/WorkspaceWidget.cpp @@ -22,14 +22,14 @@ void WorkspaceWidget::eventProcess(const Events& events) { auto side = mDockSpace.getPreviewSide(); if (side != GridLayoutWidget::NONE) { mFloatingLayer.mChildWidgets.removeNode(mFloatingLayer.mChildWidgets.find(widget)); - widget->setCollapsed(true); + widget->setCollapsed(false); widget->stopFloating(); mDockSpace.addSideWidget(widget, side); } - } else { - mDockSpace.mHandlesEvents = true; - mDockSpace.mPreview = true; } + + mDockSpace.mHandlesEvents = true; + mDockSpace.mPreview = true; } }