AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 07:30:09 +00:00
Code Issues Projects Releases Wiki Activity

GDK W32: Implement gdk_win32_screen_get_monitor_workarea()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=763012
This commit is contained in:
Руслан Ижбулатов 2016-03-02 22:07:54 +00:00
parent 0b156ea096
commit f9ed3fdd7b
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/win32/gdkscreen-win32.c
View File

@ -30,6 +30,7 @@ typedef struct
gchar *name; gchar *name;
gint width_mm, height_mm; gint width_mm, height_mm;
GdkRectangle rect; GdkRectangle rect;
GdkRectangle work_rect;
} GdkWin32Monitor; } GdkWin32Monitor;
struct _GdkWin32Screen struct _GdkWin32Screen
@ -371,6 +372,10 @@ enum_monitor (HMONITOR hmonitor,
monitor->rect.y = monitor_info.rcMonitor.top; monitor->rect.y = monitor_info.rcMonitor.top;
monitor->rect.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; monitor->rect.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
monitor->rect.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; monitor->rect.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top;
monitor->work_rect.x = monitor_info.rcWork.left;
monitor->work_rect.y = monitor_info.rcWork.top;
monitor->work_rect.width = monitor_info.rcWork.right - monitor_info.rcWork.left;
monitor->work_rect.height = monitor_info.rcWork.bottom - monitor_info.rcWork.top;
if (monitor_info.dwFlags & MONITORINFOF_PRIMARY && data->index != 0) if (monitor_info.dwFlags & MONITORINFOF_PRIMARY && data->index != 0)
{ {
@ -420,7 +425,11 @@ init_monitors (GdkWin32Screen *screen)
/* Translate monitor coords into GDK coordinate space */ /* Translate monitor coords into GDK coordinate space */
for (i = 0; i < screen->num_monitors; i++) for (i = 0; i < screen->num_monitors; i++)
{ {
GdkRectangle *rect = &screen->monitors[i].rect; GdkRectangle *rect;
rect = &screen->monitors[i].rect;
rect->x += _gdk_offset_x;
rect->y += _gdk_offset_y;
rect = &screen->monitors[i].work_rect;
rect->x += _gdk_offset_x; rect->x += _gdk_offset_x;
rect->y += _gdk_offset_y; rect->y += _gdk_offset_y;
GDK_NOTE (MISC, g_print ("Monitor %d: %dx%d@%+d%+d\n", i, GDK_NOTE (MISC, g_print ("Monitor %d: %dx%d@%+d%+d\n", i,
@ -577,6 +586,19 @@ gdk_win32_screen_get_monitor_geometry (GdkScreen *screen,
*dest = win32_screen->monitors[num_monitor].rect; *dest = win32_screen->monitors[num_monitor].rect;
} }
static void
gdk_win32_screen_get_monitor_workarea (GdkScreen *screen,
gint num_monitor,
GdkRectangle *dest)
{
GdkWin32Screen *win32_screen = GDK_WIN32_SCREEN (screen);
g_return_if_fail (screen == gdk_display_get_default_screen (gdk_display_get_default ()));
g_return_if_fail (num_monitor < win32_screen->num_monitors);
*dest = win32_screen->monitors[num_monitor].work_rect;
}
static gint static gint
gdk_win32_screen_get_number (GdkScreen *screen) gdk_win32_screen_get_number (GdkScreen *screen)
{ {
@ -759,7 +781,7 @@ gdk_win32_screen_class_init (GdkWin32ScreenClass *klass)
screen_class->get_monitor_height_mm = gdk_win32_screen_get_monitor_height_mm; screen_class->get_monitor_height_mm = gdk_win32_screen_get_monitor_height_mm;
screen_class->get_monitor_plug_name = gdk_win32_screen_get_monitor_plug_name; screen_class->get_monitor_plug_name = gdk_win32_screen_get_monitor_plug_name;
screen_class->get_monitor_geometry = gdk_win32_screen_get_monitor_geometry; screen_class->get_monitor_geometry = gdk_win32_screen_get_monitor_geometry;
screen_class->get_monitor_workarea = gdk_win32_screen_get_monitor_geometry; screen_class->get_monitor_workarea = gdk_win32_screen_get_monitor_workarea;
screen_class->is_composited = gdk_win32_screen_is_composited; screen_class->is_composited = gdk_win32_screen_is_composited;
screen_class->make_display_name = gdk_win32_screen_make_display_name; screen_class->make_display_name = gdk_win32_screen_make_display_name;
screen_class->get_active_window = gdk_win32_screen_get_active_window; screen_class->get_active_window = gdk_win32_screen_get_active_window;