paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 20:20:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix bug with main window deactivation (caused by todays commit)

Browse Source 
git-svn-id: trunk@12402 -
This commit is contained in:
paul 2007-10-10 09:26:31 +00:00
parent 7bb6447b50
commit 924b036e96
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1133,20 +1133,25 @@ begin
begin begin
if WParam <> 0 then // activated if WParam <> 0 then // activated
begin begin
//WriteLn('Restore');
RestoreStayOnTopFlags(Window); RestoreStayOnTopFlags(Window);
Windows.SetWindowPos(TWin32WidgetSet(WidgetSet).AppHandle, HWND_TOP, Windows.SetWindowPos(TWin32WidgetSet(WidgetSet).AppHandle, HWND_TOP,
0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE); 0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE);
end end
else else
begin // deactivated begin // deactivated
//WriteLn('Remove');
RemoveStayOnTopFlags(Window); RemoveStayOnTopFlags(Window);
Windows.SetWindowPos(TWin32WidgetSet(WidgetSet).AppHandle, HWND_BOTTOM,
0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE);
end; end;
// activate/deactivate main window // activate/deactivate main window
if (Application <> nil) and (Application.MainForm <> nil) and if (Application <> nil) and (Application.MainForm <> nil) and
Application.MainForm.HandleAllocated then Application.MainForm.HandleAllocated then
begin begin
CallDefaultWindowProc(Application.MainForm.Handle, WM_NCACTIVATE, WParam, LParam); //WriteLn('Activate/Deactivate main window');
CallDefaultWindowProc(Application.MainForm.Handle, WM_NCACTIVATE, WParam, 0);
end; end;
end; end;
end; end;

3
lcl/interfaces/win32/win32proc.pp
View File

@ -1156,7 +1156,8 @@ begin
if WindowInfo^.StayOnTopList <> nil then if WindowInfo^.StayOnTopList <> nil then
begin begin
for I := 0 to WindowInfo^.StayOnTopList.Count - 1 do for I := 0 to WindowInfo^.StayOnTopList.Count - 1 do
SetWindowPos(HWND(WindowInfo^.StayOnTopList.Items[I]), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE); SetWindowPos(HWND(WindowInfo^.StayOnTopList.Items[I]),
HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE);
FreeAndNil(WindowInfo^.StayOnTopList); FreeAndNil(WindowInfo^.StayOnTopList);
end; end;
end; end;