From c3336ee9f48b0bf04893ed81b6d0c9b9af019b02 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 12 Apr 2021 09:39:22 +0200 Subject: [PATCH] Fix wrongly rebased patch --- qgnomeplatform-double-click-improvements.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/qgnomeplatform-double-click-improvements.patch b/qgnomeplatform-double-click-improvements.patch index 11ee25c..f712ede 100644 --- a/qgnomeplatform-double-click-improvements.patch +++ b/qgnomeplatform-double-click-improvements.patch @@ -5,7 +5,7 @@ Subject: Improve double-click to maximize reliability diff --git a/decoration/qgnomeplatformdecoration.cpp b/decoration/qgnomeplatformdecoration.cpp -index c8b381c..6f88c24 100644 +index c8b381c..a979ab7 100644 --- a/decoration/qgnomeplatformdecoration.cpp +++ b/decoration/qgnomeplatformdecoration.cpp @@ -360,6 +360,24 @@ bool QGnomePlatformDecoration::clickButton(Qt::MouseButtons b, Button btn) @@ -17,9 +17,9 @@ index c8b381c..6f88c24 100644 + if (b & Qt::LeftButton) { + const qint64 clickInterval = m_lastButtonClick.msecsTo(currentTime); + m_lastButtonClick = currentTime; -+ const int doubleClickDistance = GnomeSettings::hint(QPlatformTheme::MouseDoubleClickDistance).toInt(); ++ const int doubleClickDistance = m_hints->hint(QPlatformTheme::MouseDoubleClickDistance).toInt(); + const QPointF posDiff = m_lastButtonClickPosition - local; -+ if ((clickInterval <= GnomeSettings::hint(QPlatformTheme::MouseDoubleClickInterval).toInt()) && ++ if ((clickInterval <= m_hints->hint(QPlatformTheme::MouseDoubleClickInterval).toInt()) && + ((posDiff.x() <= doubleClickDistance && posDiff.x() >= -doubleClickDistance) && ((posDiff.y() <= doubleClickDistance && posDiff.y() >= -doubleClickDistance)))) { + return true; + } @@ -40,16 +40,14 @@ index c8b381c..6f88c24 100644 - if (clickButton(b, Close)) + if (clickButton(b, Close)) { QWindowSystemInterface::handleCloseEvent(window()); -- } else if (m_hints->titlebarButtons().testFlag(GnomeHintsSettings::MaximizeButton) && maximizeButtonRect().contains(local)) { + } -+ } else if (GnomeSettings::titlebarButtons().testFlag(GnomeSettings::MaximizeButton) && maximizeButtonRect().contains(local)) { + } else if (m_hints->titlebarButtons().testFlag(GnomeHintsSettings::MaximizeButton) && maximizeButtonRect().contains(local)) { updateButtonHoverState(Button::Maximize); - if (clickButton(b, Maximize)) + if (clickButton(b, Maximize)) { window()->setWindowStates(window()->windowStates() ^ Qt::WindowMaximized); -- } else if (m_hints->titlebarButtons().testFlag(GnomeHintsSettings::MinimizeButton) && minimizeButtonRect().contains(local)) { + } -+ } else if (GnomeSettings::titlebarButtons().testFlag(GnomeSettings::MinimizeButton) && minimizeButtonRect().contains(local)) { + } else if (m_hints->titlebarButtons().testFlag(GnomeHintsSettings::MinimizeButton) && minimizeButtonRect().contains(local)) { updateButtonHoverState(Button::Minimize); - if (clickButton(b, Minimize)) + if (clickButton(b, Minimize)) {