Minor rename for readability

This commit is contained in:
Sergio Martins
2021-02-14 17:52:36 +00:00
parent 09a10cd791
commit c52db1945b
4 changed files with 27 additions and 26 deletions

View File

@@ -251,7 +251,7 @@ void FloatingWindow::maybeCreateResizeHandler()
{ {
if (!KDDockWidgets::usesNativeDraggingAndResizing()) { if (!KDDockWidgets::usesNativeDraggingAndResizing()) {
setFlag(Qt::FramelessWindowHint, true); setFlag(Qt::FramelessWindowHint, true);
setWidgetResizeHandler(new WidgetResizeHandler(false, this)); setWidgetResizeHandler(new WidgetResizeHandler(/*topLevel=*/ true, this));
} }
} }

View File

@@ -564,7 +564,7 @@ void Frame::setLayoutWidget(LayoutWidget *dt)
if (m_layoutWidget) { if (m_layoutWidget) {
if (isMDI()) if (isMDI())
m_resizeHandler = new WidgetResizeHandler(true, this); m_resizeHandler = new WidgetResizeHandler(/*topLevel=*/ false, this);
// We keep the connect result so we don't dereference m_layoutWidget at shutdown // We keep the connect result so we don't dereference m_layoutWidget at shutdown
m_visibleWidgetCountChangedConnection = m_visibleWidgetCountChangedConnection =
@@ -766,7 +766,7 @@ void Frame::setAllowedResizeSides(CursorPositions sides)
{ {
if (sides) { if (sides) {
delete m_resizeHandler; delete m_resizeHandler;
m_resizeHandler = new WidgetResizeHandler(true, this); m_resizeHandler = new WidgetResizeHandler(/*topLevel=*/ false, this);
m_resizeHandler->setAllowedResizeSides(sides); m_resizeHandler->setAllowedResizeSides(sides);
} else { } else {
delete m_resizeHandler; delete m_resizeHandler;

View File

@@ -36,9 +36,9 @@
using namespace KDDockWidgets; using namespace KDDockWidgets;
bool WidgetResizeHandler::s_disableAllHandlers = false; bool WidgetResizeHandler::s_disableAllHandlers = false;
WidgetResizeHandler::WidgetResizeHandler(bool filterIsGlobal, QWidgetOrQuick *target) WidgetResizeHandler::WidgetResizeHandler(bool isTopLevelResizer, QWidgetOrQuick *target)
: QObject(target) : QObject(target)
, mFilterIsGlobal(filterIsGlobal) , m_isTopLevelWindowResizer(isTopLevelResizer)
{ {
setTarget(target); setTarget(target);
} }
@@ -79,7 +79,7 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
if (!widget) if (!widget)
return false; return false;
if (!mFilterIsGlobal && (!widget->isTopLevel() || o != mTarget)) if (m_isTopLevelWindowResizer && (!widget->isTopLevel() || o != mTarget))
return false; return false;
#else #else
@@ -88,7 +88,13 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
// So, if widget is nullptr we still allow for the case of it being a mouse move event // So, if widget is nullptr we still allow for the case of it being a mouse move event
// to the QWindow // to the QWindow
if (mFilterIsGlobal) { if (m_isTopLevelWindowResizer) {
if (!widget)
return false;
if (!widget->isTopLevel() || o != mTarget)
return false;
} else {
if (!isMDI()) { if (!isMDI()) {
// For QtQuick we only support the MDI case // For QtQuick we only support the MDI case
return false; return false;
@@ -99,13 +105,6 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
if (!(qquickWindow && e->type() == QEvent::MouseMove)) if (!(qquickWindow && e->type() == QEvent::MouseMove))
return false; return false;
} }
} else {
if (!widget)
return false;
if (!widget->isTopLevel() || o != mTarget)
return false;
} }
#endif #endif
@@ -150,7 +149,7 @@ bool WidgetResizeHandler::eventFilter(QObject *o, QEvent *e)
auto mouseEvent = static_cast<QMouseEvent *>(e); auto mouseEvent = static_cast<QMouseEvent *>(e);
m_resizingInProgress = m_resizingInProgress && (mouseEvent->buttons() & Qt::LeftButton); m_resizingInProgress = m_resizingInProgress && (mouseEvent->buttons() & Qt::LeftButton);
const bool state = m_resizingInProgress; const bool state = m_resizingInProgress;
if (!mFilterIsGlobal) if (m_isTopLevelWindowResizer)
m_resizingInProgress = ((o == mTarget) && m_resizingInProgress); m_resizingInProgress = ((o == mTarget) && m_resizingInProgress);
const bool consumed = mouseMoveEvent(mouseEvent); const bool consumed = mouseMoveEvent(mouseEvent);
m_resizingInProgress = state; m_resizingInProgress = state;
@@ -394,10 +393,10 @@ void WidgetResizeHandler::setTarget(QWidgetOrQuick *w)
if (w) { if (w) {
mTarget = w; mTarget = w;
mTarget->setMouseTracking(true); mTarget->setMouseTracking(true);
if (mFilterIsGlobal) { if (m_isTopLevelWindowResizer) {
qApp->installEventFilter(this);
} else {
mTarget->installEventFilter(this); mTarget->installEventFilter(this);
} else {
qApp->installEventFilter(this);
} }
} else { } else {
qWarning() << "Target widget is null!"; qWarning() << "Target widget is null!";
@@ -447,18 +446,18 @@ void WidgetResizeHandler::updateCursor(CursorPosition m)
void WidgetResizeHandler::setMouseCursor(Qt::CursorShape cursor) void WidgetResizeHandler::setMouseCursor(Qt::CursorShape cursor)
{ {
if (mFilterIsGlobal) if (m_isTopLevelWindowResizer)
qApp->setOverrideCursor(cursor);
else
mTarget->setCursor(cursor); mTarget->setCursor(cursor);
else
qApp->setOverrideCursor(cursor);
} }
void WidgetResizeHandler::restoreMouseCursor() void WidgetResizeHandler::restoreMouseCursor()
{ {
if (mFilterIsGlobal) if (m_isTopLevelWindowResizer)
qApp->restoreOverrideCursor();
else
mTarget->setCursor(Qt::ArrowCursor); mTarget->setCursor(Qt::ArrowCursor);
else
qApp->restoreOverrideCursor();
} }
CursorPosition WidgetResizeHandler::cursorPosition(QPoint globalPos) const CursorPosition WidgetResizeHandler::cursorPosition(QPoint globalPos) const

View File

@@ -34,9 +34,11 @@ public:
/** /**
* @brief CTOR * @brief CTOR
* @param isTopLevelResizer If true, then this resize handler is for top-level widgets (aka windows)
* if false, they are docked (like for example resizing docked MDI widgets, or the sidebar overlay)
* @param target The target widget that will be resized. Also acts as parent QObject. * @param target The target widget that will be resized. Also acts as parent QObject.
*/ */
explicit WidgetResizeHandler(bool filterIsGlobal, QWidgetOrQuick *target); explicit WidgetResizeHandler(bool isTopLevelResizer, QWidgetOrQuick *target);
~WidgetResizeHandler() override; ~WidgetResizeHandler() override;
/** /**
@@ -82,7 +84,7 @@ private:
CursorPosition mCursorPos = CursorPosition_Undefined; CursorPosition mCursorPos = CursorPosition_Undefined;
QPoint mNewPosition; QPoint mNewPosition;
bool m_resizingInProgress = false; bool m_resizingInProgress = false;
const bool mFilterIsGlobal; const bool m_isTopLevelWindowResizer;
int m_resizeGap = 10; int m_resizeGap = 10;
CursorPositions mAllowedResizeSides = CursorPosition_All; CursorPositions mAllowedResizeSides = CursorPosition_All;
}; };