paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-31 11:02:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: Fixed appminimize from modal forms. Minimizing modal form now minimizes complete application. issue #26463

Browse Source 
git-svn-id: trunk@51711 -
This commit is contained in:
zeljko 2016-02-26 13:06:35 +00:00
parent f02782c7e0
commit 84f6747f70
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/interfaces/win32/win32callback.inc
View File

@ -933,7 +933,6 @@ begin
if Application.MainForm.HandleAllocated then if Application.MainForm.HandleAllocated then
Windows.ShowWindow(Application.MainFormHandle, SW_HIDE); Windows.ShowWindow(Application.MainFormHandle, SW_HIDE);
end; end;
PLMsg^.Result := Windows.DefWindowProc(Window, WM_SYSCOMMAND, WParam, LParam); PLMsg^.Result := Windows.DefWindowProc(Window, WM_SYSCOMMAND, WParam, LParam);
WinProcess := False; WinProcess := False;
Application.IntfAppMinimize; Application.IntfAppMinimize;
@ -944,6 +943,12 @@ begin
PLMsg^.Result := Windows.DefWindowProc(Window, WM_SYSCOMMAND, WParam, LParam); PLMsg^.Result := Windows.DefWindowProc(Window, WM_SYSCOMMAND, WParam, LParam);
WinProcess := False; WinProcess := False;
Application.IntfAppMinimize; Application.IntfAppMinimize;
end else
if Assigned(lWinControl) and (fsModal in TCustomForm(lWinControl).FormState) then
begin
// issue #26463
PLMsg^.Result := 1;
Win32WidgetSet.AppMinimize;
end; end;
end; end;
@ -962,7 +967,15 @@ begin
Application.IntfAppRestore; Application.IntfAppRestore;
end end
else if Assigned(lWinControl) and (lWinControl = Application.MainForm) then else if Assigned(lWinControl) and (lWinControl = Application.MainForm) then
begin
Application.IntfAppRestore; Application.IntfAppRestore;
end else
if Assigned(lWinControl) and (fsModal in TCustomForm(lWinControl).FormState) then
begin
// issue #26463
PLMsg^.Result := 1;
Win32WidgetSet.AppRestore;
end;
end; end;
procedure TWindowProcHelper.HandleSysCommand; procedure TWindowProcHelper.HandleSysCommand;

32
lcl/interfaces/win32/win32object.inc
View File

@ -164,11 +164,25 @@ end;
Minimizes the whole application to the taskbar Minimizes the whole application to the taskbar
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TWin32WidgetSet.AppMinimize; procedure TWin32WidgetSet.AppMinimize;
var
AForm: TCustomForm;
i: Integer;
begin begin
// issue #26463
if Assigned(Application) and (Application.ModalLevel > 0) then
begin
for i := Screen.CustomFormZOrderCount - 1 downto 0 do
begin
AForm := Screen.CustomFormsZOrdered[i];
if AForm.HandleAllocated and AForm.Visible and (fsModal in AForm.FormState) then
ShowWindow(AForm.Handle, SW_SHOWMINIMIZED);
end;
ShowWindow(Win32WidgetSet.AppHandle, SW_SHOWMINNOACTIVE);
end else
if Assigned(Application) and Application.MainFormOnTaskBar then if Assigned(Application) and Application.MainFormOnTaskBar then
Windows.SendMessage(Application.MainFormHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0) Windows.SendMessage(Application.MainFormHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0)
else else
Windows.SendMessage(FAppHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0) Windows.SendMessage(FAppHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -179,7 +193,23 @@ end;
Restore minimized whole application from taskbar Restore minimized whole application from taskbar
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TWin32WidgetSet.AppRestore; procedure TWin32WidgetSet.AppRestore;
var
AForm: TCustomForm;
i: Integer;
begin begin
// issue #26463
if Assigned(Application) and (Application.ModalLevel > 0) then
begin
for i := Screen.CustomFormZOrderCount - 1 downto 0 do
begin
AForm := Screen.CustomFormsZOrdered[i];
if AForm.HandleAllocated and AForm.Visible and (fsModal in AForm.FormState) then
begin
ShowWindow(AForm.Handle, SW_RESTORE);
end;
end;
ShowWindow(FAppHandle, SW_RESTORE);
end else
if Assigned(Application) and Application.MainFormOnTaskBar then if Assigned(Application) and Application.MainFormOnTaskBar then
Windows.SendMessage(Application.MainFormHandle, WM_SYSCOMMAND, SC_RESTORE, 0) Windows.SendMessage(Application.MainFormHandle, WM_SYSCOMMAND, SC_RESTORE, 0)
else else