Merge branch 'gdk-win32-fix-monitor-for-popup' into 'main'

GdkWin32: Use primary monitor as fallback if popup layout does not intersect any See merge request GNOME/gtk!4978
2022-08-23 17:20:02 +00:00
parent e68925a932 d125fcd35a
commit d7c04145ee
1 changed files with 5 additions and 0 deletions
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1180,6 +1180,11 @@ gdk_win32_surface_layout_popup (GdkSurface     *surface,

  monitor = gdk_surface_get_layout_monitor (surface, layout,
                                            gdk_win32_monitor_get_workarea);
+  if (!monitor)
+    {
+      GdkDisplay *display = gdk_surface_get_display (surface);
+      monitor = gdk_win32_display_get_primary_monitor (display);
+    }
  gdk_win32_monitor_get_workarea (monitor, &bounds);

  gdk_popup_layout_get_shadow_width (layout,