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

Use code also for other unix systems like BSD

Browse Source
This commit is contained in:
Martin Marmsoler 2023-04-17 19:38:47 +02:00
parent c6595563af
commit 1054436daf
9 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/DockFocusController.cpp
View File

@ -27,7 +27,7 @@
#include "DockManager.h" #include "DockManager.h"
#include "DockAreaTitleBar.h" #include "DockAreaTitleBar.h"
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include "linux/FloatingWidgetTitleBar.h" #include "linux/FloatingWidgetTitleBar.h"
#endif #endif
@ -44,7 +44,7 @@ struct DockFocusControllerPrivate
QPointer<CDockWidget> FocusedDockWidget = nullptr; QPointer<CDockWidget> FocusedDockWidget = nullptr;
QPointer<CDockAreaWidget> FocusedArea = nullptr; QPointer<CDockAreaWidget> FocusedArea = nullptr;
QPointer<CDockWidget> OldFocusedDockWidget = nullptr; QPointer<CDockWidget> OldFocusedDockWidget = nullptr;
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QPointer<CFloatingDockContainer> FloatingWidget = nullptr; QPointer<CFloatingDockContainer> FloatingWidget = nullptr;
#endif #endif
CDockManager* DockManager; CDockManager* DockManager;
@ -84,7 +84,7 @@ static void updateDockAreaFocusStyle(CDockAreaWidget* DockArea, bool Focused)
//=========================================================================== //===========================================================================
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
static void updateFloatingWidgetFocusStyle(CFloatingDockContainer* FloatingWidget, bool Focused) static void updateFloatingWidgetFocusStyle(CFloatingDockContainer* FloatingWidget, bool Focused)
{ {
if (FloatingWidget->hasNativeTitleBar()) if (FloatingWidget->hasNativeTitleBar())
@ -168,7 +168,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
// This code is required for styling the floating widget titlebar for linux // This code is required for styling the floating widget titlebar for linux
// depending on the current focus state // depending on the current focus state
if (FloatingWidget != NewFloatingWidget) if (FloatingWidget != NewFloatingWidget)
@ -285,7 +285,7 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
DockWidget = internal::findParent<CDockWidget*>(focusedNow); DockWidget = internal::findParent<CDockWidget*>(focusedNow);
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (!DockWidget) if (!DockWidget)
{ {
return; return;

8
src/DockManager.cpp
View File

@ -59,7 +59,7 @@
#include "DockFocusController.h" #include "DockFocusController.h"
#include "DockSplitter.h" #include "DockSplitter.h"
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include "linux/FloatingWidgetTitleBar.h" #include "linux/FloatingWidgetTitleBar.h"
#endif #endif
@ -192,7 +192,7 @@ void DockManagerPrivate::loadStylesheet()
QString FileName = ":ads/stylesheets/"; QString FileName = ":ads/stylesheets/";
FileName += CDockManager::testConfigFlag(CDockManager::FocusHighlighting) FileName += CDockManager::testConfigFlag(CDockManager::FocusHighlighting)
? "focus_highlighting" : "default"; ? "focus_highlighting" : "default";
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
FileName += "_linux"; FileName += "_linux";
#endif #endif
FileName += ".css"; FileName += ".css";
@ -510,7 +510,7 @@ CDockManager::CDockManager(QWidget *parent) :
d->FocusController = new CDockFocusController(this); d->FocusController = new CDockFocusController(this);
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
window()->installEventFilter(this); window()->installEventFilter(this);
connect(qApp, &QApplication::focusWindowChanged, [](QWindow* focusWindow) connect(qApp, &QApplication::focusWindowChanged, [](QWindow* focusWindow)
@ -552,7 +552,7 @@ CDockManager::~CDockManager()
} }
//============================================================================ //============================================================================
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
bool CDockManager::eventFilter(QObject *obj, QEvent *e) bool CDockManager::eventFilter(QObject *obj, QEvent *e)
{ {
// Emulate Qt:Tool behaviour. // Emulate Qt:Tool behaviour.

2
src/DockManager.h
View File

@ -560,7 +560,7 @@ public:
widget->setFocus(Qt::OtherFocusReason); widget->setFocus(Qt::OtherFocusReason);
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
bool eventFilter(QObject *obj, QEvent *e) override; bool eventFilter(QObject *obj, QEvent *e) override;
#endif #endif

6
src/DockOverlay.cpp
View File

@ -139,7 +139,7 @@ struct DockOverlayCrossPrivate
*/ */
qreal dropIndicatiorWidth(QLabel* l) const qreal dropIndicatiorWidth(QLabel* l) const
{ {
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
Q_UNUSED(l) Q_UNUSED(l)
return 40; return 40;
#else #else
@ -333,7 +333,7 @@ CDockOverlay::CDockOverlay(QWidget* parent, eMode Mode) :
{ {
d->Mode = Mode; d->Mode = Mode;
d->Cross = new CDockOverlayCross(this); d->Cross = new CDockOverlayCross(this);
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint); setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
#else #else
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint); setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
@ -595,7 +595,7 @@ CDockOverlayCross::CDockOverlayCross(CDockOverlay* overlay) :
d(new DockOverlayCrossPrivate(this)) d(new DockOverlayCrossPrivate(this))
{ {
d->DockOverlay = overlay; d->DockOverlay = overlay;
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint); setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
#else #else
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint); setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);

22
src/FloatingDockContainer.cpp
View File

@ -52,7 +52,7 @@
#pragma comment(lib, "User32.lib") #pragma comment(lib, "User32.lib")
#endif #endif
#endif #endif
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include "linux/FloatingWidgetTitleBar.h" #include "linux/FloatingWidgetTitleBar.h"
#include <xcb/xcb.h> #include <xcb/xcb.h>
#endif #endif
@ -374,7 +374,7 @@ struct FloatingDockContainerPrivate
QPoint DragStartPos; QPoint DragStartPos;
bool Hiding = false; bool Hiding = false;
bool AutoHideChildren = true; bool AutoHideChildren = true;
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QWidget* MouseEventHandler = nullptr; QWidget* MouseEventHandler = nullptr;
CFloatingWidgetTitleBar* TitleBar = nullptr; CFloatingWidgetTitleBar* TitleBar = nullptr;
bool IsResizing = false; bool IsResizing = false;
@ -424,7 +424,7 @@ struct FloatingDockContainerPrivate
void setWindowTitle(const QString &Text) void setWindowTitle(const QString &Text)
{ {
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (TitleBar) if (TitleBar)
{ {
TitleBar->setTitle(Text); TitleBar->setTitle(Text);
@ -540,7 +540,7 @@ void FloatingDockContainerPrivate::updateDropOverlays(const QPoint &GlobalPos)
return; return;
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
// Prevent display of drop overlays and docking as long as a model dialog // Prevent display of drop overlays and docking as long as a model dialog
// is active // is active
if (qApp->activeModalWidget()) if (qApp->activeModalWidget())
@ -641,7 +641,7 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) :
connect(d->DockContainer, SIGNAL(dockAreasRemoved()), this, connect(d->DockContainer, SIGNAL(dockAreasRemoved()), this,
SLOT(onDockAreasAddedOrRemoved())); SLOT(onDockAreasAddedOrRemoved()));
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QDockWidget::setWidget(d->DockContainer); QDockWidget::setWidget(d->DockContainer);
QDockWidget::setFloating(true); QDockWidget::setFloating(true);
QDockWidget::setFeatures(QDockWidget::DockWidgetClosable QDockWidget::setFeatures(QDockWidget::DockWidgetClosable
@ -768,7 +768,7 @@ void CFloatingDockContainer::changeEvent(QEvent *event)
ADS_PRINT("FloatingWidget::changeEvent QEvent::ActivationChange "); ADS_PRINT("FloatingWidget::changeEvent QEvent::ActivationChange ");
d->zOrderIndex = ++zOrderCounter; d->zOrderIndex = ++zOrderCounter;
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (d->DraggingState == DraggingFloatingWidget) if (d->DraggingState == DraggingFloatingWidget)
{ {
d->titleMouseReleaseEvent(); d->titleMouseReleaseEvent();
@ -920,7 +920,7 @@ void CFloatingDockContainer::hideEvent(QHideEvent *event)
void CFloatingDockContainer::showEvent(QShowEvent *event) void CFloatingDockContainer::showEvent(QShowEvent *event)
{ {
Super::showEvent(event); Super::showEvent(event);
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting)) if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
{ {
this->window()->activateWindow(); this->window()->activateWindow();
@ -933,7 +933,7 @@ void CFloatingDockContainer::showEvent(QShowEvent *event)
void CFloatingDockContainer::startFloating(const QPoint &DragStartMousePos, void CFloatingDockContainer::startFloating(const QPoint &DragStartMousePos,
const QSize &Size, eDragState DragState, QWidget *MouseEventHandler) const QSize &Size, eDragState DragState, QWidget *MouseEventHandler)
{ {
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (!isMaximized()) if (!isMaximized())
{ {
resize(Size); resize(Size);
@ -1070,7 +1070,7 @@ bool CFloatingDockContainer::restoreState(CDockingStateReader &Stream,
return false; return false;
} }
onDockAreasAddedOrRemoved(); onDockAreasAddedOrRemoved();
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if(d->TitleBar) if(d->TitleBar)
{ {
d->TitleBar->setMaximizedIcon(windowState() == Qt::WindowMaximized); d->TitleBar->setMaximizedIcon(windowState() == Qt::WindowMaximized);
@ -1114,7 +1114,7 @@ void CFloatingDockContainer::hideAndDeleteLater()
void CFloatingDockContainer::finishDragging() void CFloatingDockContainer::finishDragging()
{ {
ADS_PRINT("CFloatingDockContainer::finishDragging"); ADS_PRINT("CFloatingDockContainer::finishDragging");
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
setWindowOpacity(1); setWindowOpacity(1);
activateWindow(); activateWindow();
if (d->MouseEventHandler) if (d->MouseEventHandler)
@ -1229,7 +1229,7 @@ void CFloatingDockContainer::moveEvent(QMoveEvent *event)
#endif #endif
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
//============================================================================ //============================================================================
void CFloatingDockContainer::onMaximizeRequest() void CFloatingDockContainer::onMaximizeRequest()
{ {

10
src/FloatingDockContainer.h
View File

@ -33,7 +33,7 @@
#include <QRubberBand> #include <QRubberBand>
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include <QDockWidget> #include <QDockWidget>
#define tFloatingWidgetBase QDockWidget #define tFloatingWidgetBase QDockWidget
#else #else
@ -182,10 +182,8 @@ protected: // reimplements QWidget
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
virtual bool event(QEvent *e) override; virtual bool event(QEvent *e) override;
virtual void moveEvent(QMoveEvent *event) override; virtual void moveEvent(QMoveEvent *event) override;
#endif #elif defined(Q_OS_UNIX)
#ifdef Q_OS_LINUX
virtual void moveEvent(QMoveEvent *event) override; virtual void moveEvent(QMoveEvent *event) override;
virtual void resizeEvent(QResizeEvent *event) override; virtual void resizeEvent(QResizeEvent *event) override;
virtual bool event(QEvent *e) override; virtual bool event(QEvent *e) override;
@ -264,7 +262,7 @@ public:
*/ */
void hideAndDeleteLater(); void hideAndDeleteLater();
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
/** /**
* This is a function that responds to FloatingWidgetTitleBar::maximizeRequest() * This is a function that responds to FloatingWidgetTitleBar::maximizeRequest()
* Maximize or normalize the container size. * Maximize or normalize the container size.

2
src/FloatingDragPreview.cpp
View File

@ -262,7 +262,7 @@ CFloatingDragPreview::CFloatingDragPreview(QWidget* Content, QWidget* parent) :
setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_TranslucentBackground);
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
auto Flags = windowFlags(); auto Flags = windowFlags();
Flags |= Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint; Flags |= Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint;
setWindowFlags(Flags); setWindowFlags(Flags);

6
src/ads_globals.cpp
View File

@ -38,7 +38,7 @@
#include "IconProvider.h" #include "IconProvider.h"
#include "ads_globals.h" #include "ads_globals.h"
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include <QSettings> #include <QSettings>
#include <QFile> #include <QFile>
#include <QApplication> #include <QApplication>
@ -52,7 +52,7 @@ namespace internal
{ {
const int FloatingWidgetDragStartEvent = QEvent::registerEventType(); const int FloatingWidgetDragStartEvent = QEvent::registerEventType();
const int DockedWidgetDragStartEvent = QEvent::registerEventType(); const int DockedWidgetDragStartEvent = QEvent::registerEventType();
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
static QString _window_manager; static QString _window_manager;
static QHash<QString, xcb_atom_t> _xcb_atom_cache; static QHash<QString, xcb_atom_t> _xcb_atom_cache;
@ -371,7 +371,7 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
return; return;
} }
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
Button->setIcon(Button->style()->standardIcon(StandarPixmap)); Button->setIcon(Button->style()->standardIcon(StandarPixmap));
#else #else
// The standard icons does not look good on high DPI screens so we create // The standard icons does not look good on high DPI screens so we create

4
src/ads_globals.h
View File

@ -40,7 +40,7 @@
#include <iostream> #include <iostream>
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include <xcb/xcb.h> #include <xcb/xcb.h>
#endif #endif
@ -156,7 +156,7 @@ static const char* const DirtyProperty = "dirty";
extern const int FloatingWidgetDragStartEvent; extern const int FloatingWidgetDragStartEvent;
extern const int DockedWidgetDragStartEvent; extern const int DockedWidgetDragStartEvent;
#ifdef Q_OS_LINUX #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
// Utils to directly communicate with the X server // Utils to directly communicate with the X server
/** /**
* Get atom from cache or request it from the XServer. * Get atom from cache or request it from the XServer.