[gtk+/wip/window-scales: 2/11] quartz: Implement get_scale_factor() on screen and window
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/window-scales: 2/11] quartz: Implement get_scale_factor() on screen and window
- Date: Tue, 4 Jun 2013 09:57:31 +0000 (UTC)
commit 20cbaf6edd5fb45b8c0f88487ca8f9d2f03c2d00
Author: Michael Natterer <mitch gimp org>
Date: Fri Jan 18 15:47:29 2013 +0100
quartz: Implement get_scale_factor() on screen and window
which return 1.0 normally and 2.0 on retina displays.
gdk/quartz/gdkscreen-quartz.c | 30 ++++++++++++++++++++++++++++++
gdk/quartz/gdkwindow-quartz.c | 21 +++++++++++++++++++++
2 files changed, 51 insertions(+), 0 deletions(-)
---
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index 84269f5..4b19afc 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -427,6 +427,35 @@ gdk_quartz_screen_get_monitor_workarea (GdkScreen *screen,
GDK_QUARTZ_RELEASE_POOL;
}
+/* Protocol to build cleanly for OSX < 10.7 */
+ protocol ScaleFactor
+- (CGFloat) backingScaleFactor;
+ end
+
+gdouble
+_gdk_quartz_screen_get_monitor_scale_factor (GdkScreen *screen,
+ gint monitor_num)
+{
+ GdkScreenQuartz *quartz_screen;
+ NSArray *array;
+ NSScreen *nsscreen;
+ gdouble scale_factor = 1.0;
+
+ quartz_screen = GDK_SCREEN_QUARTZ (screen);
+
+ GDK_QUARTZ_ALLOC_POOL;
+
+ array = [NSScreen screens];
+ nsscreen = [array objectAtIndex:monitor_num];
+
+ if (gdk_quartz_osx_version() >= GDK_OSX_LION)
+ scale_factor = [(id <ScaleFactor>) nsscreen backingScaleFactor];
+
+ GDK_QUARTZ_RELEASE_POOL;
+
+ return scale_factor;
+}
+
static gchar *
gdk_quartz_screen_make_display_name (GdkScreen *screen)
{
@@ -491,4 +520,5 @@ gdk_quartz_screen_class_init (GdkQuartzScreenClass *klass)
screen_class->query_depths = _gdk_quartz_screen_query_depths;
screen_class->query_visual_types = _gdk_quartz_screen_query_visual_types;
screen_class->list_visuals = _gdk_quartz_screen_list_visuals;
+ screen_class->get_monitor_scale_factor = _gdk_quartz_screen_get_monitor_scale_factor;
}
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 2403b04..d5eac3f 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2997,6 +2997,26 @@ gdk_quartz_window_get_input_shape (GdkWindow *window)
return NULL;
}
+/* Protocol to build cleanly for OSX < 10.7 */
+ protocol ScaleFactor
+- (CGFloat) backingScaleFactor;
+ end
+
+static gdouble
+gdk_quartz_window_get_scale_factor (GdkWindow *window)
+{
+ GdkWindowImplQuartz *impl;
+
+ if (GDK_WINDOW_DESTROYED (window))
+ return 1.0;
+
+ impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl);
+
+ if (gdk_quartz_osx_version() >= GDK_OSX_LION)
+ return [(id <ScaleFactor>) impl->toplevel backingScaleFactor];
+
+ return 1.0;
+}
static void
gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
@@ -3036,6 +3056,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
impl_class->begin_paint_region = gdk_window_impl_quartz_begin_paint_region;
impl_class->end_paint = gdk_window_impl_quartz_end_paint;
+ impl_class->get_scale_factor = gdk_quartz_window_get_scale_factor;
impl_class->focus = gdk_quartz_window_focus;
impl_class->set_type_hint = gdk_quartz_window_set_type_hint;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]