rpms/qgnomeplatform
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix wrongly rebased patch

Browse Source
This commit is contained in:
Jan Grulich 2021-04-12 09:39:22 +02:00
parent 4ed57c1f05
commit c3336ee9f4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qgnomeplatform-double-click-improvements.patch
View File

@ -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)) {