From 78d4e799251bbf3e1188035d6fbf20e22824ec5f Mon Sep 17 00:00:00 2001
From: Simon Schneegans <code@simonschneegans.de>
Date: Mon, 5 Jun 2023 21:58:52 +0200
Subject: [PATCH] :beetle: Fix support dialog on GTK4

---
 prefs.js                   |  2 +-
 resources/ui/gtk4/prefs.ui | 58 ++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/prefs.js b/prefs.js
index f19c319..7f0dcd1 100644
--- a/prefs.js
+++ b/prefs.js
@@ -410,7 +410,7 @@ var PreferencesDialog = class PreferencesDialog {
               this._settings.set_boolean('show-support-dialog', false);
             }
 
-            if (!utils.isGTK4()) {
+            if (!utils.isADW()) {
               dialog.close();
             }
           });
diff --git a/resources/ui/gtk4/prefs.ui b/resources/ui/gtk4/prefs.ui
index c362bc8..ffad045 100644
--- a/resources/ui/gtk4/prefs.ui
+++ b/resources/ui/gtk4/prefs.ui
@@ -38,40 +38,36 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="text">Do you want to support Burn-My-Windows?</property>
     <property name="secondary-text">If only one out of ten users would support this project with 1$ / month, I could work full-time on open-source projects!</property>
     <property name="modal">true</property>
-    <child internal-child="vbox">
+    <child internal-child="message_area">
       <object class="GtkBox">
-        <child internal-child="message_area">
-          <object class="GtkBox">
-            <child>
-              <object class="GtkLabel">
-                <property name="hexpand">true</property>
-                <property name="halign">start</property>
-                <property name="use-markup">true</property>
-                <property name="label">Support me on Ko-fi: &lt;a href='https://ko-fi.com/schneegans'&gt;https://ko-fi.com/schneegans&lt;/a&gt;</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="hexpand">true</property>
-                <property name="halign">start</property>
-                <property name="use-markup">true</property>
-                <property name="label">Support me on GitHub: &lt;a href='https://github.com/sponsors/schneegans'&gt;https://github.com/sponsors/schneegans&lt;/a&gt;</property>
-              </object>
-            </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="hexpand">true</property>
+            <property name="halign">start</property>
+            <property name="use-markup">true</property>
+            <property name="label">Support me on Ko-fi: &lt;a href='https://ko-fi.com/schneegans'&gt;https://ko-fi.com/schneegans&lt;/a&gt;</property>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox">
-            <child>
-              <object class="GtkButton" id="support_never_button">
-                <property name="label">Do not show this again!</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="support_later_button">
-                <property name="label">Maybe later...</property>
-              </object>
-            </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="hexpand">true</property>
+            <property name="halign">start</property>
+            <property name="use-markup">true</property>
+            <property name="label">Support me on GitHub: &lt;a href='https://github.com/sponsors/schneegans'&gt;https://github.com/sponsors/schneegans&lt;/a&gt;</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child internal-child="action_area">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkButton" id="support_never_button">
+            <property name="label">Do not show this again!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="support_later_button">
+            <property name="label">Maybe later...</property>
           </object>
         </child>
       </object>