mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Local changes

Browse Source
This commit is contained in:
Jon Jenssen 2023-08-01 16:30:32 +02:00
parent 65600a4dcd
commit 7b0454dec6
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,6 +7,8 @@ qrc_*
moc_* moc_*
ui_* ui_*
Makefile Makefile
/out
CMakePresets.json
# IDEs # IDEs
.idea .idea

4
CMakeLists.txt
View File

@ -25,8 +25,8 @@ endif()
project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT})
option(BUILD_STATIC "Build the static library" OFF) option(BUILD_STATIC "Build the static library" ON)
option(BUILD_EXAMPLES "Build the examples" ON) option(BUILD_EXAMPLES "Build the examples" OFF)
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
set(ads_PlatformDir "x86") set(ads_PlatformDir "x86")

7
src/FloatingDockContainer.cpp
View File

@ -702,6 +702,11 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) :
{ {
native_window = false; native_window = false;
} }
QString WaylandDisplay = qgetenv("WAYLAND_DISPLAY").toLower();
if (WaylandDisplay != "")
{
native_window = false;
}
} }
if (native_window) if (native_window)
@ -713,7 +718,7 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) :
{ {
d->TitleBar = new CFloatingWidgetTitleBar(this); d->TitleBar = new CFloatingWidgetTitleBar(this);
setTitleBarWidget(d->TitleBar); setTitleBarWidget(d->TitleBar);
setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::FramelessWindowHint); setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::BypassWindowManagerHint);
d->TitleBar->enableCloseButton(isClosable()); d->TitleBar->enableCloseButton(isClosable());
connect(d->TitleBar, SIGNAL(closeRequested()), SLOT(close())); connect(d->TitleBar, SIGNAL(closeRequested()), SLOT(close()));
connect(d->TitleBar, &CFloatingWidgetTitleBar::maximizeRequested, connect(d->TitleBar, &CFloatingWidgetTitleBar::maximizeRequested,