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

win32: updating fsStayOnTop windows handling of TOPMOST/NONTOPMOST flags by pushing a window to BOTTOM and restoring to the application TOP (not system wide). Should fix #018036

Browse Source 
git-svn-id: trunk@51067 -
This commit is contained in:
dmitry 2015-12-28 17:06:04 +00:00
parent 6f720f5eaa
commit f2db2ee23e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,11 +868,22 @@ begin
StayOnTopWindowsInfo^.StayOnTopList := TFPList.Create;
WindowInfo := GetWin32WindowInfo(AppHandle);
WindowInfo^.StayOnTopList := StayOnTopWindowsInfo^.StayOnTopList;
// EnumWindow() suggests the order from top-most to bottom windows
// EnumThreadWindoes() doesn't suggest the order, but assuming the same.
// See RestoreStayOnTopFlags
EnumThreadWindows(GetWindowThreadProcessId(AppHandle, nil),
@EnumStayOnTopRemove, LPARAM(StayOnTopWindowsInfo));
for I := 0 to WindowInfo^.StayOnTopList.Count - 1 do
SetWindowPos(HWND(WindowInfo^.StayOnTopList[I]), HWND_NOTOPMOST, 0, 0, 0, 0,
begin
// Starting with Windows 7, setting HWND_NOTOPMOST keeps the window
// on top of another active window. So currently, the code sends
// the window to the very bottom and then restores it as "_TOP"
// to prevent the overlapping
SetWindowPos(HWND(WindowInfo^.StayOnTopList[I]), HWND_BOTTOM, 0, 0, 0, 0,
SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE or SWP_NOOWNERZORDER or SWP_DRAWFRAME);
SetWindowPos(HWND(WindowInfo^.StayOnTopList[I]), HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE or SWP_NOOWNERZORDER or SWP_DRAWFRAME);
end;
Dispose(StayOnTopWindowsInfo);
end;
inc(InRemoveStayOnTopFlags);
@ -889,7 +900,10 @@ begin
WindowInfo := GetWin32WindowInfo(AppHandle);
if WindowInfo^.StayOnTopList <> nil then
begin
for I := 0 to WindowInfo^.StayOnTopList.Count - 1 do
// the order of the list is assumed to be
// from top to bottom, thus the restoration of the list
// should be from bottom to top as well
for I := WindowInfo^.StayOnTopList.Count - 1 downto 0 do
SetWindowPos(HWND(WindowInfo^.StayOnTopList.Items[I]),
HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE or SWP_NOSIZE or SWP_NOACTIVATE or SWP_NOOWNERZORDER or SWP_DRAWFRAME);