|
| 1 | +diff --git gdk/quartz/gdkwindow-quartz.c gdk/quartz/gdkwindow-quartz.c |
| 2 | +index 5d6d522846..df2a8d051e 100644 |
| 3 | +--- gdk/quartz/gdkwindow-quartz.c |
| 4 | ++++ gdk/quartz/gdkwindow-quartz.c |
| 5 | +@@ -1185,8 +1185,41 @@ gdk_window_quartz_show (GdkWindow *window, gboolean already_mapped) |
| 6 | + clear_toplevel_order (); |
| 7 | + |
| 8 | + _gdk_quartz_events_send_map_event (window); |
| 9 | ++ |
| 10 | ++ /* Fix for menu height scaling on standard DPI monitors in mixed DPI environments */ |
| 11 | ++ if (window->window_type == GDK_WINDOW_TEMP && impl->toplevel) |
| 12 | ++ { |
| 13 | ++ GdkDisplay *display = gdk_window_get_display(window); |
| 14 | ++ GdkMonitor *monitor = gdk_display_get_monitor_at_window(display, window); |
| 15 | ++ gint scale_factor = gdk_monitor_get_scale_factor(monitor); |
| 16 | ++ |
| 17 | ++ /* Only fix on low-DPI monitors */ |
| 18 | ++ if (scale_factor == 1) |
| 19 | ++ { |
| 20 | ++ if (!g_object_get_data (G_OBJECT (window), "quartz-menu-height-fixed")) |
| 21 | ++ { |
| 22 | ++ NSWindow *nswindow = impl->toplevel; |
| 23 | ++ NSRect frame = [nswindow frame]; |
| 24 | ++ NSView *contentView = [nswindow contentView]; |
| 25 | ++ |
| 26 | ++ /* Apply a modest adjustment to compensate for the 1/4 height issue */ |
| 27 | ++ /* Using a tiny multiplier is enough since macOS corrects itself after first display */ |
| 28 | ++ frame.size.height *= 1.01; |
| 29 | ++ |
| 30 | ++ /* Resize the window with animation disabled */ |
| 31 | ++ [nswindow setFrame:frame display:YES animate:NO]; |
| 32 | ++ |
| 33 | ++ /* Force layout update */ |
| 34 | ++ [contentView setNeedsDisplay:YES]; |
| 35 | ++ |
| 36 | ++ /* Mark as fixed */ |
| 37 | ++ g_object_set_data (G_OBJECT (window), "quartz-menu-height-fixed", |
| 38 | ++ GINT_TO_POINTER (TRUE)); |
| 39 | ++ } |
| 40 | ++ } |
| 41 | ++ } |
| 42 | + } |
| 43 | +- else |
| 44 | ++ else |
| 45 | + { |
| 46 | + [impl->view setHidden:NO]; |
| 47 | + } |
0 commit comments