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

Fix Qt6 build

Browse Source 
Didn't include the cmake changes, as those are hacks for now.
Only included fixes to cpp code.
This commit is contained in:
Sérgio Martins
2020-07-18 18:49:12 +01:00
committed by Sergio Martins
parent beaa45d16d
commit 8474f246ae
7 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/private/WidgetResizeHandler.cpp
View File

@@ -24,6 +24,7 @@
#include "DragController_p.h"
#include "Config.h"
#include "widgets/FrameWidget_p.h"
#include "Qt5Qt6Compat_p.h"
#include <QEvent>
#include <QMouseEvent>
@@ -74,19 +75,19 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
if (mTarget->isMaximized())
break;
auto mouseEvent = static_cast<QMouseEvent *>(e);
auto cursorPos = cursorPosition(mouseEvent->globalPos());
auto cursorPos = cursorPosition(Qt5Qt6Compat::eventGlobalPos(mouseEvent));
if (cursorPos == CursorPosition::Undefined)
return false;
const QRect widgetRect = mTarget->rect().marginsAdded(QMargins(widgetResizeHandlerMargin, widgetResizeHandlerMargin, widgetResizeHandlerMargin, widgetResizeHandlerMargin));
const QPoint cursorPoint = mTarget->mapFromGlobal(mouseEvent->globalPos());
const QPoint cursorPoint = mTarget->mapFromGlobal(Qt5Qt6Compat::eventGlobalPos(mouseEvent));
if (!widgetRect.contains(cursorPoint))
return false;
if (mouseEvent->button() == Qt::LeftButton) {
mResizeWidget = true;
}
mNewPosition = mouseEvent->globalPos();
mNewPosition = Qt5Qt6Compat::eventGlobalPos(mouseEvent);
mCursorPos = cursorPos;
return true;
}
@@ -121,7 +122,7 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
void WidgetResizeHandler::mouseMoveEvent(QMouseEvent *e)
{
const QPoint globalPos = e->globalPos();
const QPoint globalPos = Qt5Qt6Compat::eventGlobalPos(e);
if (!mResizeWidget) {
updateCursor(cursorPosition(globalPos));
return;