Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-02-03 21:09:03 +01:00
Code Issues Packages Projects Releases Activity

Update windows version

Browse Source
This commit is contained in:
Ximi1970
2023-07-22 22:44:28 +02:00
parent 9dcd6a7645
commit a6a7bfb070
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/SysTray-X/SysTray-X-app/windowctrl.cpp
View File

@@ -300,6 +300,22 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
QList< quint64 > win_ids = getWinIds();
/*
* Minimize on startup always to the tray
*/
TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
if( state == Preferences::STATE_MINIMIZED_ALL )
{
/*
* Minimize target on close depends on preference
*/
Preferences::CloseType closeType = getCloseType();
if( closeType == Preferences::PREF_MINIMIZE_ALL_WINDOWS || closeType == Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS )
{
targetType = TargetType::TYPE_WINDOW_TO_TASKBAR;
}
}
/*
* Close pressed on one of the windows, minimize them all
*/
@@ -311,7 +327,7 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
.arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) );
#endif
minimizeWindow( win_ids.at( i ), getMinimizeType() );
minimizeWindow( win_ids.at( i ), targetType );
}
}
@@ -396,6 +412,12 @@ void WindowCtrl::slotShowHide()
*/
QList< quint64 > win_ids = getWinIds();
TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
if( getMinimizeIconType() == Preferences::PREF_DEFAULT_MINIMIZE_ICON )
{
targetType = TargetType::TYPE_WINDOW_TO_TASKBAR;
}
for( int i = 0 ; i < win_ids.length() ; ++i )
{
#ifdef DEBUG_DISPLAY_ACTIONS
@@ -410,7 +432,7 @@ void WindowCtrl::slotShowHide()
}
else
{
minimizeWindow( win_ids.at( i ), getMinimizeType() );
minimizeWindow( win_ids.at( i ), targetType );
}
}