From 1cd73ae7f5006b803118008deb754c9aa070ecc0 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Mon, 28 Dec 2020 23:46:48 +0100
Subject: [PATCH] Change minimize type default

---
 app/SysTray-X/SysTray-X-app/debug.h         |  1 -
 app/SysTray-X/SysTray-X-app/preferences.cpp |  2 +-
 app/SysTray-X/SysTray-X-app/preferences.ui  | 10 +++++-----
 app/SysTray-X/SysTray-X-app/windowctrl.cpp  |  5 +++++
 webext/background.js                        |  2 +-
 webext/options.js                           |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/debug.h b/app/SysTray-X/SysTray-X-app/debug.h
index ecaa51d..4ac4a39 100644
--- a/app/SysTray-X/SysTray-X-app/debug.h
+++ b/app/SysTray-X/SysTray-X-app/debug.h
@@ -8,5 +8,4 @@
 //#define DEBUG_DISPLAY_ACTIONS_DETAILS
 //#define DEBUG_DISPLAY_ACTIONS_END
 
-
 #endif // DEBUG_H
diff --git a/app/SysTray-X/SysTray-X-app/preferences.cpp b/app/SysTray-X/SysTray-X-app/preferences.cpp
index 11bab0c..3c2f717 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.cpp
+++ b/app/SysTray-X/SysTray-X-app/preferences.cpp
@@ -62,7 +62,7 @@ Preferences::Preferences( QObject *parent ) : QObject( parent )
     m_number_alignment = 4;
     m_number_margins = QMargins();
 
-    m_minimize_type = PREF_MINIMIZE_METHOD_1;
+    m_minimize_type = PREF_DEFAULT_MINIMIZE;
     m_start_minimized = false;
     m_close_type = PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS;
 
diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui
index 9e9441a..8069f57 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.ui
+++ b/app/SysTray-X/SysTray-X-app/preferences.ui
@@ -321,7 +321,7 @@
                   <string>Default minimize</string>
                  </property>
                  <property name="checked">
-                  <bool>false</bool>
+                  <bool>true</bool>
                  </property>
                  <attribute name="buttonGroup">
                   <string notr="true">minimizeTypeGroup</string>
@@ -334,7 +334,7 @@
                   <string>Minimize to tray</string>
                  </property>
                  <property name="checked">
-                  <bool>true</bool>
+                  <bool>false</bool>
                  </property>
                  <attribute name="buttonGroup">
                   <string notr="true">minimizeTypeGroup</string>
@@ -694,11 +694,11 @@
  </resources>
  <connections/>
  <buttongroups>
-  <buttongroup name="minimizeTypeGroup"/>
-  <buttongroup name="defaultIconTypeGroup"/>
-  <buttongroup name="closeTypeGroup"/>
   <buttongroup name="themeGroup"/>
   <buttongroup name="countTypeGroup"/>
+  <buttongroup name="minimizeTypeGroup"/>
+  <buttongroup name="defaultIconTypeGroup"/>
   <buttongroup name="iconTypeGroup"/>
+  <buttongroup name="closeTypeGroup"/>
  </buttongroups>
 </ui>
diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp
index 071ff51..9f44bcb 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp
+++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp
@@ -348,6 +348,11 @@ void    WindowCtrl::slotPositions( QList< QPoint > window_positions )
 {
 #ifdef Q_OS_UNIX
 
+    /*
+     *  Update the TB windows
+     */
+    findWindows( m_ppid );
+
     setPositions( window_positions );
 
 #endif
diff --git a/webext/background.js b/webext/background.js
index 1960ad1..1a72a85 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -302,7 +302,7 @@ SysTrayX.Messaging = {
 
   sendPreferencesStorage: function (result) {
     const debug = result.debug || "false";
-    const minimizeType = result.minimizeType || "1";
+    const minimizeType = result.minimizeType || "0";
     const closeType = result.closeType || "1";
     const startMinimized = result.startMinimized || "false";
     const restorePositions = result.restorePositions || "false";
diff --git a/webext/options.js b/webext/options.js
index 0f0cb5b..4c80009 100644
--- a/webext/options.js
+++ b/webext/options.js
@@ -437,7 +437,7 @@ SysTrayX.RestoreOptions = {
   //
   setMinimizeType: function (result) {
     //    const platformInfo = result.platformInfo || { os: "linux" };
-    const minimizeType = result.minimizeType || "1";
+    const minimizeType = result.minimizeType || "0";
 
     // Tweak option for platform
     //    if (platformInfo.os === "win") {