From 687b9be7863efe9a8d1c6bba9209ddf394e34411 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 16 Jan 2021 16:40:50 +0100 Subject: [PATCH] Cleanup --- app/SysTray-X/SysTray-X-app/windowctrl.cpp | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp index 5895b5b..61f327a 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp @@ -310,16 +310,18 @@ void WindowCtrl::slotShowHide() emit signalConsole( "Show/Hide" ); #endif +#ifdef Q_OS_UNIX + /* * Update the TB windows */ findWindows( m_ppid ); -#ifdef Q_OS_UNIX - + /* + * Update the positions + */ updatePositions(); -#endif /* * Get the window ids */ @@ -350,6 +352,39 @@ void WindowCtrl::slotShowHide() // findWindows( m_ppid ); updateX11WindowStates(); +#else + + /* + * Update the TB windows + */ + findWindows( m_ppid ); + + /* + * Get the window ids + */ + QList< quint64 > win_ids = getWinIds(); + QList< Preferences::WindowState > win_states = getWindowStates(); + + for( int i = 0 ; i < win_ids.length() ; ++i ) + { +#ifdef DEBUG_DISPLAY_ACTIONS + emit signalConsole( QString( "Window state: %1, %2" ) + .arg( win_ids.at( i ) ) + .arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) ); +#endif + + if( win_states.at( i ) == Preferences::STATE_MINIMIZED ) + { + normalizeWindow( win_ids.at( i ) ); + } + else + { + minimizeWindow( win_ids.at( i ), getMinimizeType() ); + } + } + +#endif + #ifdef DEBUG_DISPLAY_ACTIONS emit signalConsole( "Show/Hide end" ); #endif