From 8f678cb351c2b26f9be508a4447f0e6736e1b978 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Wed, 2 Nov 2022 08:36:26 +0100
Subject: [PATCH] Restore old patch for client-side window decorations

---
 ...use-more-updated-window-states-value.patch | 49 +++++++++++++++++++
 qgnomeplatform.spec                           |  7 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 qgnomeplatform-use-more-updated-window-states-value.patch

diff --git a/qgnomeplatform-use-more-updated-window-states-value.patch b/qgnomeplatform-use-more-updated-window-states-value.patch
new file mode 100644
index 0000000..b84ac8f
--- /dev/null
+++ b/qgnomeplatform-use-more-updated-window-states-value.patch
@@ -0,0 +1,49 @@
+diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
+index b05a9b4..7f2ae9a 100644
+--- a/src/decoration/qgnomeplatformdecoration.cpp
++++ b/src/decoration/qgnomeplatformdecoration.cpp
+@@ -182,7 +182,7 @@ QMargins QGnomePlatformDecoration::margins(MarginsType marginsType) const
+ #else
+ QMargins QGnomePlatformDecoration::margins() const
+ {
+-    if ((window()->windowStates() & Qt::WindowMaximized)) {
++    if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
+         return QMargins(0, TITLEBAR_HEIGHT, 0, 0);
+     }
+
+@@ -372,7 +372,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
+     // *                              *
+     // ********************************
+     QPainterPath borderRect;
+-    if (!(window()->windowStates() & Qt::WindowMaximized)) {
++    if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
+         borderRect.addRoundedRect(0, 0, surfaceRect.width(), margins().top() + 8, 10, 10);
+         p.fillPath(borderRect.simplified(), borderColor);
+     }
+@@ -390,7 +390,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
+     // *                              *
+     // ********************************
+     QPainterPath roundedRect;
+-    if ((window()->windowStates() & Qt::WindowMaximized)) {
++    if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
+         roundedRect.addRect(0, 0, surfaceRect.width(), margins().top() + 8);
+     } else {
+         roundedRect
+@@ -414,7 +414,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
+     // *|                            |*
+     // *------------------------------*
+     // ********************************
+-    if (!(window()->windowStates() & Qt::WindowMaximized)) {
++    if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
+         QPainterPath borderPath;
+         // Left
+         borderPath.addRect(0, margins().top(), margins().left(), surfaceRect.height() - margins().top() - WINDOW_BORDER_WIDTH);
+@@ -499,7 +499,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
+     if (GnomeSettings::getInstance().titlebarButtons().testFlag(GnomeSettings::getInstance().MaximizeButton)) {
+         renderButton(&p,
+                      maximizeButtonRect(),
+-                     (window()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
++                     (waylandWindow()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
+                      m_maximizeButtonHovered && active,
+                      m_clicking == Button::Maximize || m_clicking == Button::Restore);
+     }
diff --git a/qgnomeplatform.spec b/qgnomeplatform.spec
index a0b433c..13017f9 100644
--- a/qgnomeplatform.spec
+++ b/qgnomeplatform.spec
@@ -1,6 +1,6 @@
 Name:           qgnomeplatform
 Version:        0.9.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Qt Platform Theme aimed to accommodate Gnome settings
 
 License:        LGPLv2+
@@ -10,6 +10,8 @@ Source0:        https://github.com/FedoraQt/QGnomePlatform/archive/%{version}/QG
 # Upstream patches
 Patch0:         qgnomeplatform-fix-window-content-geometry-for-qt5-when-shadows-are-enabled.patch
 
+Patch50:        qgnomeplatform-use-more-updated-window-states-value.patch
+
 BuildRequires:  make
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(udev)
@@ -104,6 +106,9 @@ modifying them - making them fit into the environment as well as possible.
 %{_qt6_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
 
 %changelog
+* Wed Nov 02 2022 Jan Grulich <jgrulich@redhat.com> - 0.9.0-4
+- Restore old patch for client-side window decorations
+
 * Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 0.9.0-3
 - Rebuild (qt5)