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

LCL-GTK2: Fix TPopupMenu on 2 monitors aligned vertically. Issue #39422, patch by Alexey T.

Browse Source
This commit is contained in:
Juha 2021-10-09 00:23:02 +03:00
parent e42dfcff56
commit 30ba61883f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/gtk2/gtk2wsmenus.pp
View File

@ -22,7 +22,7 @@ interface
uses uses
// RTL // RTL
Classes, Types, glib2, gdk2, gtk2, Classes, Types, glib2, gdk2, gtk2, math,
// LazUtils // LazUtils
LazTracer, LazTracer,
// LCL // LCL
@ -572,21 +572,20 @@ procedure GtkWS_Popup(menu: PGtkMenu; X, Y: pgint; {%H-}push_in: pgboolean;
var var
Requisition: TGtkRequisition; Requisition: TGtkRequisition;
Alignment: TPopupAlignment; Alignment: TPopupAlignment;
ScreenHeight: gint; MonitorNum: gint;
MonitorRect: TGdkRectangle;
begin begin
X^ := PPoint(WidgetInfo^.UserData)^.X; X^ := PPoint(WidgetInfo^.UserData)^.X;
Y^ := PPoint(WidgetInfo^.UserData)^.Y; Y^ := PPoint(WidgetInfo^.UserData)^.Y;
if WidgetInfo^.LCLObject is TPopupMenu then if WidgetInfo^.LCLObject is TPopupMenu then
begin begin
// make menu to fit the screen vertically
gtk_widget_size_request(PGtkWidget(menu), @Requisition); gtk_widget_size_request(PGtkWidget(menu), @Requisition);
ScreenHeight := gdk_screen_height();
if Y^ + Requisition.height > ScreenHeight then // make menu to fit the monitor vertically
begin MonitorNum := gdk_screen_get_monitor_at_point(gdk_screen_get_default, X^, Y^);
Y^ := ScreenHeight - Requisition.height; gdk_screen_get_monitor_geometry(gdk_screen_get_default, MonitorNum, @MonitorRect);
if Y^ < 0 then Y^ := 0; Y^ := Max(MonitorRect.y, Min(Y^, MonitorRect.y + MonitorRect.height - Requisition.height));
end;
// get actual alignment // get actual alignment
Alignment := TPopupMenu(WidgetInfo^.LCLObject).Alignment; Alignment := TPopupMenu(WidgetInfo^.LCLObject).Alignment;