Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lrn/gtk224-w32-monitor-enum' into 'gtk-2-24'

Browse Source 
GDK W32: ensure that monitor enumeration matches up

See merge request GNOME/gtk!182
This commit is contained in:
Matthias Clasen
2018-08-30 17:20:06 +00:00
parent eec3ce0b4e 2c13b00bc1
commit 664537d618
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gdk/win32/gdkdisplay-win32.c
View File

@@ -82,7 +82,12 @@ enum_monitor (HMONITOR hmonitor,
gint *index = (gint *) data;
GdkWin32Monitor *monitor;
g_assert (*index < _gdk_num_monitors);
if (*index >= _gdk_num_monitors)
{
(*index) += 1;
return TRUE;
}
monitor = _gdk_monitors + *index;
@@ -126,14 +131,21 @@ _gdk_monitor_init (void)
#ifdef HAVE_MONITOR_INFO
gint i, index;
_gdk_num_monitors = 0;
/* In case something happens between monitor counting and monitor
* enumeration, repeat until the count matches up.
* enum_monitor is coded to ignore any monitors past _gdk_num_monitors.
*/
do
{
_gdk_num_monitors = 0;
EnumDisplayMonitors (NULL, NULL, count_monitor, (LPARAM) &_gdk_num_monitors);
EnumDisplayMonitors (NULL, NULL, count_monitor, (LPARAM) &_gdk_num_monitors);
_gdk_monitors = g_renew (GdkWin32Monitor, _gdk_monitors, _gdk_num_monitors);
_gdk_monitors = g_renew (GdkWin32Monitor, _gdk_monitors, _gdk_num_monitors);
index = 0;
EnumDisplayMonitors (NULL, NULL, enum_monitor, (LPARAM) &index);
index = 0;
EnumDisplayMonitors (NULL, NULL, enum_monitor, (LPARAM) &index);
} while (index != _gdk_num_monitors);
_gdk_offset_x = G_MININT;
_gdk_offset_y = G_MININT;