forked from AuroraMiddleware/gtk
1729da8a3e
Instead we just cache the monitor number and get out of it the nsscreen when it is needed. This is a requirement since it nsscreen it is not supposed to be cached. Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1312
66 lines
1.9 KiB
C
66 lines
1.9 KiB
C
/*
|
|
* Copyright © 2017 Tom Schoonjans
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib.h>
|
|
#include <gio/gio.h>
|
|
|
|
#include "gdkmonitor-quartz.h"
|
|
#include "gdkscreen-quartz.h"
|
|
|
|
|
|
G_DEFINE_TYPE (GdkQuartzMonitor, gdk_quartz_monitor, GDK_TYPE_MONITOR)
|
|
|
|
static void
|
|
gdk_quartz_monitor_get_workarea (GdkMonitor *monitor,
|
|
GdkRectangle *dest)
|
|
{
|
|
GdkQuartzScreen *quartz_screen = GDK_QUARTZ_SCREEN(_gdk_screen);
|
|
GdkQuartzMonitor *quartz_monitor = GDK_QUARTZ_MONITOR(monitor);
|
|
|
|
GDK_QUARTZ_ALLOC_POOL;
|
|
|
|
NSArray *array = [NSScreen screens];
|
|
if (quartz_monitor->monitor_num < [array count])
|
|
{
|
|
NSScreen *screen = [array objectAtIndex:quartz_monitor->monitor_num];
|
|
NSRect rect = [screen visibleFrame];
|
|
|
|
dest->x = rect.origin.x - quartz_screen->min_x;
|
|
dest->y = quartz_screen->height - (rect.origin.y + rect.size.height) + quartz_screen->min_y;
|
|
dest->width = rect.size.width;
|
|
dest->height = rect.size.height;
|
|
}
|
|
else
|
|
*dest = monitor->geometry;
|
|
|
|
GDK_QUARTZ_RELEASE_POOL;
|
|
}
|
|
|
|
static void
|
|
gdk_quartz_monitor_init (GdkQuartzMonitor *monitor)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gdk_quartz_monitor_class_init (GdkQuartzMonitorClass *class)
|
|
{
|
|
GDK_MONITOR_CLASS (class)->get_workarea = gdk_quartz_monitor_get_workarea;
|
|
}
|
|
|