From e9d7c3b54a9e6987f2d01a29dbbd07bc21078b6f Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Thu, 30 Jan 2025 10:44:50 -0500
Subject: [PATCH] Reset target page when prefs dialog is already opened

---
 prefs.js               | 18 ++++++++++++------
 ui/SettingsDonation.ui | 10 +++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/prefs.js b/prefs.js
index 3efd98e..30eabb9 100644
--- a/prefs.js
+++ b/prefs.js
@@ -234,12 +234,18 @@ const Preferences = class {
         this._addFormatValueCallbacks();
         this._bindSettings();
 
-        let targetPageName = settings.get_string('target-prefs-page')
-        
-        if (targetPageName) {
-            window.set_visible_page_name(targetPageName)
-            settings.set_string('target-prefs-page', '')
+        let maybeGoToPage = () => {
+            let targetPageName = settings.get_string('target-prefs-page')
+
+            if (targetPageName) {
+                window.set_visible_page_name(targetPageName)
+                settings.set_string('target-prefs-page', '')
+            }
         }
+        
+        settings.connect('changed::target-prefs-page', maybeGoToPage);
+
+        maybeGoToPage();
     }
 
     /**
@@ -2161,7 +2167,7 @@ const Preferences = class {
             clearTimeout(revealDonateTimeout)
             
             if (this.notebook.visible_page_name == 'donation' && !donationRevealer.get_reveal_child())
-                revealDonateTimeout = setTimeout(() => donationRevealer.set_reveal_child(true), 14000)
+                revealDonateTimeout = setTimeout(() => donationRevealer.set_reveal_child(true), 10000)
         })
     }
 
diff --git a/ui/SettingsDonation.ui b/ui/SettingsDonation.ui
index 626f692..a672c78 100644
--- a/ui/SettingsDonation.ui
+++ b/ui/SettingsDonation.ui
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <interface>
+  <!-- interface-name SettingsDonation.ui -->
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.6"/>
   <object class="AdwPreferencesPage" id="donation">
@@ -63,8 +64,9 @@
                     <child>
                       <object class="GtkImage" id="paypal_logo">
                         <property name="margin-bottom">2</property>
+                        <property name="margin-end">2</property>
                         <property name="margin-top">2</property>
-                        <property name="pixel-size">32</property>
+                        <property name="pixel-size">24</property>
                       </object>
                     </child>
                     <child>
@@ -89,8 +91,9 @@
                     <child>
                       <object class="GtkImage" id="stripe_logo">
                         <property name="margin-bottom">2</property>
+                        <property name="margin-end">2</property>
                         <property name="margin-top">2</property>
-                        <property name="pixel-size">32</property>
+                        <property name="pixel-size">24</property>
                       </object>
                     </child>
                     <child>
@@ -115,8 +118,9 @@
                     <child>
                       <object class="GtkImage" id="kofi_logo">
                         <property name="margin-bottom">2</property>
+                        <property name="margin-end">2</property>
                         <property name="margin-top">2</property>
-                        <property name="pixel-size">32</property>
+                        <property name="pixel-size">24</property>
                       </object>
                     </child>
                     <child>