callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement gdk_screen_get_monitor_scale_factor generically

Browse Source 
This was forgotten when the other screen monitor apis were
ported to GdkMonitor.

https://bugzilla.gnome.org/show_bug.cgi?id=771349
This commit is contained in:
Matthias Clasen
2016-09-13 10:45:06 -04:00
parent 323a59577b
commit 21bdf617ce
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/gdkscreen.c
View File

@ -1095,16 +1095,15 @@ gint
gdk_screen_get_monitor_scale_factor (GdkScreen *screen, gdk_screen_get_monitor_scale_factor (GdkScreen *screen,
gint monitor_num) gint monitor_num)
{ {
GdkScreenClass *screen_class; GdkMonitor *monitor;
g_return_val_if_fail (GDK_IS_SCREEN (screen), 1); g_return_val_if_fail (GDK_IS_SCREEN (screen), 1);
g_return_val_if_fail (monitor_num >= 0, 1); g_return_val_if_fail (monitor_num >= 0, 1);
g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), 1); g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), 1);
screen_class = GDK_SCREEN_GET_CLASS (screen); monitor = get_monitor (screen, monitor_num);
if (screen_class->get_monitor_scale_factor) g_return_val_if_fail (monitor != NULL, 1);
return screen_class->get_monitor_scale_factor (screen, monitor_num);
return 1; return gdk_monitor_get_scale_factor (monitor);
} }