[gtk: 1/2] GdkWin32: Position popups on the primary monitor if outside of the visible screen area




commit d125fcd35ac2a547e7ad698aa8841927c0ef7366
Author: Luca Bacci <luca bacci982 gmail com>
Date:   Tue Aug 23 14:54:01 2022 +0200

    GdkWin32: Position popups on the primary monitor if outside of the visible screen area
    
    Fixes a crash caused by attempting to dereference a NULL GdkMonitor*
    in GdkWin32.
    
    See https://gitlab.gnome.org/GNOME/gtk/-/issues/5125

 gdk/win32/gdksurface-win32.c | 5 +++++
 1 file changed, 5 insertions(+)
---
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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]