philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the last occurrences of KDDOCKWIDGETS_QTWIDGETS

Browse Source 
Don't define it in cmake anymore as it's official dead
This commit is contained in:
Sergio Martins
2022-05-31 22:43:35 +01:00
parent affd1d12ae
commit 529cedfcbf
3 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -153,9 +153,6 @@ set(KDDW_FRONTEND_QTQUICK ON)
add_definitions(-DQT_NO_KEYWORDS)
# TODOv2: remove
add_definitions(-DKDDOCKWIDGETS_QTWIDGETS)
if (KDDW_FRONTEND_QTWIDGETS)
add_definitions(-DKDDW_FRONTEND_QTWIDGETS)

56
src/private/DragController.cpp
View File

@@ -790,20 +790,22 @@ static QWidget *qtTopLevelForHWND(HWND hwnd)
if (hwnd == ( HWND )window->winId()) {
if (auto result = DockRegistry::self()->topLevelForHandle(window))
return result;
#ifdef KDDOCKWIDGETS_QTWIDGETS
// It's not a KDDW window, but we still return something, as the KDDW main window
// might be embedded into another non-kddw QMainWindow
// Case not supported for QtQuick.
const QWidgetList widgets = qApp->topLevelWidgets();
for (QWidget *widget : widgets) {
if (!widget->window()) {
// Don't call winId on windows that don't have it, as that will force all its childrens to have it,
// and that's not very stable. a top level might not have one because it's being destroyed, or because
// it's a top-level just because it has't been reparented I guess.
continue;
}
if (hwnd == ( HWND )widget->winId()) {
return widget;
#ifdef KDDW_FRONTEND_QTWIDGETS
if (Platform::instance()->isQtWidgets()) {
// It's not a KDDW window, but we still return something, as the KDDW main window
// might be embedded into another non-kddw QMainWindow
// Case not supported for QtQuick.
const QWidgetList widgets = qApp->topLevelWidgets();
for (QWidget *widget : widgets) {
if (!widget->window()) {
// Don't call winId on windows that don't have it, as that will force all its childrens to have it,
// and that's not very stable. a top level might not have one because it's being destroyed, or because
// it's a top-level just because it has't been reparented I guess.
continue;
}
if (hwnd == ( HWND )widget->winId()) {
return widget;
}
}
}
#endif
@@ -876,21 +878,24 @@ ViewWrapper::Ptr DragController::qtTopLevelUnderCursor() const
return tl;
}
} else {
#ifdef KDDOCKWIDGETS_QTWIDGETS // Maybe it's embedded in a QWinWidget:
auto topLevels = qApp->topLevelWidgets();
for (auto topLevel : topLevels) {
if (QLatin1String(topLevel->metaObject()->className()) == QLatin1String("QWinWidget")) {
if (hwnd == GetParent(HWND(topLevel->window()->winId()))) {
if (topLevel->rect().contains(topLevel->mapFromGlobal(globalPos)) && topLevel->objectName() != QStringLiteral("_docks_IndicatorWindow_Overlay")) {
qCDebug(toplevels) << Q_FUNC_INFO << "Found top-level" << topLevel;
return topLevel;
#ifdef KDDW_FRONTEND_QTWIDGETS
if (Platform::instance()->isQtWidgets()) {
// Maybe it's embedded in a QWinWidget:
auto topLevels = qApp->topLevelWidgets();
for (auto topLevel : topLevels) {
if (QLatin1String(topLevel->metaObject()->className()) == QLatin1String("QWinWidget")) {
if (hwnd == GetParent(HWND(topLevel->window()->winId()))) {
if (topLevel->rect().contains(topLevel->mapFromGlobal(globalPos)) && topLevel->objectName() != QStringLiteral("_docks_IndicatorWindow_Overlay")) {
qCDebug(toplevels) << Q_FUNC_INFO << "Found top-level" << topLevel;
return topLevel;
}
}
}
}
}
#endif // QtWidgets A window belonging to another app is below the cursor
qCDebug(toplevels) << Q_FUNC_INFO << "Window from another app is under cursor" << hwnd;
return nullptr;
qCDebug(toplevels) << Q_FUNC_INFO << "Window from another app is under cursor" << hwnd;
return nullptr;
}
}
}
#endif // Q_OS_WIN
@@ -904,7 +909,6 @@ ViewWrapper::Ptr DragController::qtTopLevelUnderCursor() const
if (!ok) {
qCDebug(toplevels) << Q_FUNC_INFO << "No top-level found. Some windows weren't seen by XLib";
}
} else {
// !Windows: Linux, macOS, offscreen (offscreen on Windows too), etc.

9
src/private/WindowBeingDragged.cpp
View File

@@ -14,6 +14,7 @@
#include "DragController_p.h"
#include "Logging_p.h"
#include "Utils_p.h"
#include "Platform.h"
#include "controllers/TitleBar.h"
#include "controllers/Stack.h"
@@ -212,11 +213,13 @@ WindowBeingDraggedWayland::WindowBeingDraggedWayland(Draggable *draggable)
// case #2: the floating window itself is the draggable, happens on platforms that support
// native dragging. Not the case for Wayland. But adding this case for completeness.
m_floatingWindow = fw;
#ifdef KDDOCKWIDGETS_QTWIDGETS
#ifdef KDDW_FRONTEND_QTWIDGETS // TODOv2: Review this block
} else if (auto tabBar = draggable->asView()->asTabBarController()) {
m_dockWidget = tabBar->currentDockWidget();
if (Platform::instance()->isQtWidgets())
m_dockWidget = tabBar->currentDockWidget();
} else if (auto stack = draggable->asView()->asStackController()) {
m_frame = stack->frame();
if (Platform::instance()->isQtWidgets())
m_frame = stack->frame();
#endif
} else {
qWarning() << "Unknown draggable" << draggable << "please fix";