sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Bug fix: When minimizing command-line operation, task bar button was hidden

Browse Source 
Source commit: fb140c2372095e81c41b4f055a93fde198458bdc
This commit is contained in:
Martin Prikryl
2018-06-25 13:40:41 +00:00
parent 25b2cf883c
commit 6f2e21efc9
1 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/windows/WinInterface.cpp
View File

@@ -1370,36 +1370,57 @@ void __fastcall CallGlobalMinimizeHandler(TObject * Sender)
//---------------------------------------------------------------------------
static void __fastcall DoApplicationMinimizeRestore(bool Minimize)
{
// WORKAROUND
// When main window is hidden (command-line operation),
// we do not want it to be shown by TApplication.Restore,
// so we temporarily detach it from an application.
// Probably not really necessary for minimizing phase,
// but we do it for consistency anyway.
TForm * MainForm = Application->MainForm;
bool RestoreMainForm = false;
if (DebugAlwaysTrue(MainForm != NULL) &&
!MainForm->Visible)
{
SetAppMainForm(NULL);
RestoreMainForm = true;
}
try
TForm * MainLikeForm = GetMainForm();
if ((MainLikeForm != MainForm) && !WinConfiguration->MinimizeToTray)
{
TWindowState PreviousWindowState;
if (Minimize)
{
Application->Minimize();
PreviousWindowState = MainLikeForm->WindowState;
MainLikeForm->WindowState = wsMinimized;
}
else
{
Application->Restore();
MainLikeForm->WindowState = PreviousWindowState;
}
}
__finally
else
{
if (RestoreMainForm)
// What is described below should not ever happen, except when minimizing to tray,
// as we capture command-line operation above.
// Had we called TApplication::Minimize, it would hide all non-MainForm windows, including MainLineForm,
// so it actually also hides taskbar button, what we do not want.
// WORKAROUND
// When main window is hidden (command-line operation),
// we do not want it to be shown by TApplication.Restore,
// so we temporarily detach it from an application.
// Probably not really necessary for minimizing phase,
// but we do it for consistency anyway.
bool RestoreMainForm = false;
if (DebugAlwaysTrue(MainForm != NULL) &&
!MainForm->Visible)
{
SetAppMainForm(MainForm);
SetAppMainForm(NULL);
RestoreMainForm = true;
}
try
{
if (Minimize)
{
Application->Minimize();
}
else
{
Application->Restore();
}
}
__finally
{
if (RestoreMainForm)
{
SetAppMainForm(MainForm);
}
}
}
}