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

widgets tunes

Browse source
This commit is contained in:
IlyaShurupov 2024-06-29 09:38:44 +03:00 • committed by Ilya Shurupov
parent da6990ddc8
commit aa141405c6
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Graphics/private/Window.cpp
View file

@ -64,7 +64,7 @@ Window* Window::createWindow(Vec2F size, const char* title) {
} }
count--; count--;
// glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
// glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR); // glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR);
// Initialize GLFW // Initialize GLFW

2
Widgets/private/FloatingWidget.cpp
View file

@ -41,7 +41,7 @@ void FloatingWidget::checkFloating(const Events& events) {
mFloating = true; mFloating = true;
} }
if (mFloating && this->mHeader.isReleased()) { if (mFloating && isReleased()) {
mFloating = false; mFloating = false;
this->mHeader.clearEvents(); this->mHeader.clearEvents();
} }

2
Widgets/private/WidgetBase.cpp
View file

@ -86,7 +86,7 @@ void Widget::checkVisibility(const Events& events, const RectF& parentArea) {
} }
void Widget::checkFocus(const Events& events) { 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 != mInFocus) {
if (currentFocus) eventFocusEnter(events); if (currentFocus) eventFocusEnter(events);

6
Widgets/private/WorkspaceWidget.cpp
View file

@ -22,16 +22,16 @@ void WorkspaceWidget::eventProcess(const Events& events) {
auto side = mDockSpace.getPreviewSide(); auto side = mDockSpace.getPreviewSide();
if (side != GridLayoutWidget::NONE) { if (side != GridLayoutWidget::NONE) {
mFloatingLayer.mChildWidgets.removeNode(mFloatingLayer.mChildWidgets.find(widget)); mFloatingLayer.mChildWidgets.removeNode(mFloatingLayer.mChildWidgets.find(widget));
widget->setCollapsed(true); widget->setCollapsed(false);
widget->stopFloating(); widget->stopFloating();
mDockSpace.addSideWidget(widget, side); mDockSpace.addSideWidget(widget, side);
} }
} else { }
mDockSpace.mHandlesEvents = true; mDockSpace.mHandlesEvents = true;
mDockSpace.mPreview = true; mDockSpace.mPreview = true;
} }
} }
}
for (auto& dockedChild : mDockSpace.mSideWidgets) { for (auto& dockedChild : mDockSpace.mSideWidgets) {
auto widget = dynamic_cast<FloatingWidget*>(dockedChild.widget); auto widget = dynamic_cast<FloatingWidget*>(dockedChild.widget);