summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Bacci <luca.bacci982@gmail.com>2022-08-23 17:20:02 +0000
committerLuca Bacci <luca.bacci982@gmail.com>2022-08-23 17:20:02 +0000
commitd7c04145ee4d2aa7c2f1ef9653de7d8708e9854a (patch)
tree9138fc19ef45b5bc5b7c2c3ecdeb3ac796a730be
parente68925a932ad3d5c1228aaeb6ed89dbe2e30225d (diff)
parentd125fcd35ac2a547e7ad698aa8841927c0ef7366 (diff)
downloadgtk+-d7c04145ee4d2aa7c2f1ef9653de7d8708e9854a.tar.gz
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
-rw-r--r--gdk/win32/gdksurface-win32.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 6fc15f3815..a94e43b68d 100644
--- 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,