diff --git a/app/SysTray-X/SysTray-X-app/preferences.cpp b/app/SysTray-X/SysTray-X-app/preferences.cpp index 3c2f717..11bab0c 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_DEFAULT_MINIMIZE; + m_minimize_type = PREF_MINIMIZE_METHOD_1; 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 8069f57..9e9441a 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.ui +++ b/app/SysTray-X/SysTray-X-app/preferences.ui @@ -321,7 +321,7 @@ Default minimize - true + false minimizeTypeGroup @@ -334,7 +334,7 @@ Minimize to tray - false + true minimizeTypeGroup @@ -694,11 +694,11 @@ - - - + + + diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp index 5cfc4ca..cb7d292 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp @@ -210,6 +210,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state ) emit signalConsole( QString( "Window state: %1, %2" ) .arg( win_ids.at( i ) ) .arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) ); + + emit signalConsole( QString( "Window state internal: %1, %2" ) + .arg( win_ids.at( i ) ) + .arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) ); #endif if( ( win_states.at( i ) != Preferences::STATE_MINIMIZED && getMinimizeType() == Preferences::PREF_DEFAULT_MINIMIZE ) || @@ -227,6 +231,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state ) emit signalConsole( QString( "Window state: %1, %2" ) .arg( win_ids.at( i ) ) .arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) ); + + emit signalConsole( QString( "Window state internal: %1, %2" ) + .arg( win_ids.at( i ) ) + .arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) ); #endif if( ( win_states.at( i ) == Preferences::STATE_MINIMIZED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) ) @@ -298,7 +306,7 @@ void WindowCtrl::slotShowHide() .arg( win_ids.at( i ) ) .arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) ); - emit signalConsole( QString( "Window state: %1, %2" ) + emit signalConsole( QString( "Window state internal: %1, %2" ) .arg( win_ids.at( i ) ) .arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) ); #endif diff --git a/webext/background.js b/webext/background.js index 1a72a85..1960ad1 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 || "0"; + const minimizeType = result.minimizeType || "1"; 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 4c80009..0f0cb5b 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 || "0"; + const minimizeType = result.minimizeType || "1"; // Tweak option for platform // if (platformInfo.os === "win") {