Merge branch 'fix-panel-monitor' into 'master'

x11: Try harder to find the right monitor

Closes #3900

See merge request GNOME/gtk!3477
This commit is contained in:
Matthias Clasen 2021-04-27 03:48:13 +00:00
commit 82f8fc3bee

View File

@ -1822,9 +1822,16 @@ gdk_x11_surface_layout_popup (GdkSurface *surface,
monitor = gdk_surface_get_layout_monitor (surface, layout,
gdk_x11_monitor_get_workarea);
gdk_x11_monitor_get_workarea (monitor, &bounds);
if (monitor)
gdk_x11_monitor_get_workarea (monitor, &bounds);
else
{
monitor = gdk_surface_get_layout_monitor (surface, layout,
gdk_monitor_get_geometry);
gdk_monitor_get_geometry (monitor, &bounds);
}
gdk_popup_layout_get_shadow_width (layout,
gdk_popup_layout_get_shadow_width (layout,
&impl->shadow_left,
&impl->shadow_right,
&impl->shadow_top,