paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: TCocoaWSPopupMenu.Popup() refactored

Browse Source
This commit is contained in:
rich2014 2023-10-21 00:33:37 +08:00
parent 275776771b
commit 7f7a01a35b
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -950,44 +950,28 @@ end;
class procedure TCocoaWSPopupMenu.Popup(const APopupMenu: TPopupMenu; const X,
Y: Integer);
var
menu : TCocoaMenu;
view : NSView;
w : NSWindow;
px, py: Integer;
menuY: Integer;
menu: TCocoaMenu;
point: TPoint;
screen: NSScreen;
mouseY: CGFloat;
menuY: CGFloat;
begin
if (not Assigned(APopupMenu)) or (APopupMenu.Handle=0) then
exit;
px := x;
py := y;
menu := TCocoaMenu(APopupMenu.Handle);
view := nil;
w :=NSApp.keyWindow;
// in macOS it's possible to "rightclick" without focusing a window
// so let's try to find the window
if not Assigned(w) then
w := GetCocoaWindowAtPos( NSMakePoint(px, Round(NSGlobalScreenHeight) - py) );
point:= TPoint.Create( x, y );
screen:= getScreenFromHMonitor( CocoaWidgetSet.MonitorFromPoint(point, MONITOR_DEFAULTTONULL) );
if Assigned(w) then
begin
view := w.contentView;
if Assigned(view) then
begin
// LCL Screen coordinate
menuY := Round(NSGlobalScreenHeight - w.screen.visibleFrame.origin.y - menu.size.height) - 1;
py := min(py, menuY);
view.lclScreenToLocal(px, py);
// have to flip again, because popUpMenuPositioningItem expects point
// to be in View coordinates and it does respect Flipped flag
if not view.isFlipped then
py := Round(view.frame.size.height) - py;
end;
end
else
py := Round(NSGlobalScreenHeight) - py;
mouseY:= NSGlobalScreenHeight - y;
if Assigned(screen) then begin
menuY:= screen.visibleFrame.origin.y + menu.size.height + 1;
menuY:= max( mouseY, MenuY );
end else begin
menuY:= mouseY;
end;
menu.popUpMenuPositioningItem_atLocation_inView(nil, NSMakePoint(px, py), view);
menu.popUpMenuPositioningItem_atLocation_inView(nil, NSMakePoint(x,menuY), nil);
APopupMenu.Close; // notify LCL popup menu
end;