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

Cocoa/Form: make OnTopForm compatible with FullScreen

Browse Source
This commit is contained in:
rich2014 2023-11-17 18:50:17 +08:00
parent 481187923e
commit dd43ea568f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/cocoa/cocoawindows.pas
View File

@ -146,6 +146,7 @@ type
public
_keyEvCallback: ICommonCallback;
callback: IWindowCallback;
keepWinLevel : NSInteger;
//LCLForm: TCustomForm;
procedure dealloc; override;
function makeFirstResponder(aResponder: NSResponder): ObjCBOOL; override;
@ -775,6 +776,8 @@ begin
// MacOS does 10.7 fullscreen switch with an animation (that's about 1 second long)
// if during that animation there's another call toggleFullScreen() is made
// then macOS produces an output "not in fullscreen state" and ignores the call.
self.setLevel( NSNormalWindowLevel );
end;
procedure TCocoaWindow.windowDidEnterFullScreen(notification: NSNotification);
@ -788,6 +791,9 @@ begin
if orderOutAfterFS then begin
self.orderOut(nil);
orderOutAfterFS := false;
end else begin
if self.level<>self.keepWinLevel then
self.setLevel(self.keepWinLevel);
end;
end;

2
lcl/interfaces/cocoa/cocoawsforms.pas
View File

@ -231,6 +231,8 @@ var
begin
lvl := CGWindowLevelForKey(FormStyleToWindowLevelKey[AFormStyle]);
win.setLevel(lvl);
if win.isKindOfClass(TCocoaWindow) then
TCocoaWindow(win).keepWinLevel := lvl;
end;
{ TCocoaWSHintWindow }