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

Some more renaming

Browse Source
This commit is contained in:
Matthias Clasen
2016-04-02 17:08:53 -04:00
parent b224d1df61
commit d04d12e0b5
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/gdkmonitor.c
View File

@@ -228,15 +228,20 @@ gdk_monitor_get_geometry (GdkMonitor *monitor,
*geometry = monitor->geometry;
}
void
gdk_monitor_get_physical_size (GdkMonitor *monitor,
int *width_mm,
int *height_mm)
int
gdk_monitor_get_width_mm (GdkMonitor *monitor)
{
g_return_if_fail (GDK_IS_MONITOR (monitor));
g_return_val_if_fail (GDK_IS_MONITOR (monitor), 0);
*width_mm = monitor->width_mm;
*height_mm = monitor->height_mm;
return monitor->width_mm;
}
int
gdk_monitor_get_height_mm (GdkMonitor *monitor)
{
g_return_val_if_fail (GDK_IS_MONITOR (monitor), 0);
return monitor->height_mm;
}
const char *

6
gdk/gdkmonitor.h
View File

@@ -58,9 +58,9 @@ GDK_AVAILABLE_IN_3_22
void gdk_monitor_get_geometry (GdkMonitor *monitor,
GdkRectangle *geometry);
GDK_AVAILABLE_IN_3_22
void gdk_monitor_get_physical_size (GdkMonitor *monitor,
int *width_mm,
int *height_mm);
int gdk_monitor_get_width_mm (GdkMonitor *monitor);
GDK_AVAILABLE_IN_3_22
int gdk_monitor_get_height_mm (GdkMonitor *monitor);
GDK_AVAILABLE_IN_3_22
const char * gdk_monitor_get_manufacturer (GdkMonitor *monitor);
GDK_AVAILABLE_IN_3_22

10
gdk/gdkscreen.c
View File

@@ -768,12 +768,9 @@ gdk_screen_real_get_monitor_width_mm (GdkScreen *screen,
gint monitor_num)
{
GdkMonitor *monitor;
int width_mm, height_mm;
monitor = get_monitor (screen, monitor_num);
gdk_monitor_get_physical_size (monitor, &width_mm, &height_mm);
return width_mm;
return gdk_monitor_get_width_mm (monitor);
}
static gint
@@ -781,12 +778,9 @@ gdk_screen_real_get_monitor_height_mm (GdkScreen *screen,
gint monitor_num)
{
GdkMonitor *monitor;
int width_mm, height_mm;
monitor = get_monitor (screen, monitor_num);
gdk_monitor_get_physical_size (monitor, &width_mm, &height_mm);
return height_mm;
return gdk_monitor_get_height_mm (monitor);
}
static gchar *