From 94c3562511d6f17f00036503dfdffe3d53994dbc Mon Sep 17 00:00:00 2001 From: Jon Jenssen Date: Tue, 1 Aug 2023 16:30:32 +0200 Subject: [PATCH] Local changes --- .gitignore | 1 + src/FloatingDockContainer.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 24872f0..705fc99 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ moc_* ui_* Makefile /out +CMakePresets.json # IDEs .idea diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp index 16c7489..400bb54 100644 --- a/src/FloatingDockContainer.cpp +++ b/src/FloatingDockContainer.cpp @@ -702,6 +702,11 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) : { native_window = false; } + QString WaylandDisplay = qgetenv("WAYLAND_DISPLAY").toLower(); + if (WaylandDisplay != "") + { + native_window = false; + } } if (native_window) @@ -713,7 +718,7 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) : { d->TitleBar = new CFloatingWidgetTitleBar(this); setTitleBarWidget(d->TitleBar); - setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::FramelessWindowHint); + setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::BypassWindowManagerHint); d->TitleBar->enableCloseButton(isClosable()); connect(d->TitleBar, SIGNAL(closeRequested()), SLOT(close())); connect(d->TitleBar, &CFloatingWidgetTitleBar::maximizeRequested,