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

wayland: Use GdkMonitor APIs

Browse Source
This commit is contained in:
Benjamin Otte 2016-09-04 21:52:55 +02:00
parent 7232b4f735
commit f7cebf5c1f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/wayland/gdkwindow-wayland.c
View File

@ -353,8 +353,8 @@ _gdk_wayland_screen_create_root_window (GdkScreen *screen,
int width, int width,
int height) int height)
{ {
GdkWaylandDisplay *display_wayland = GdkDisplay *display = gdk_screen_get_display (screen);
GDK_WAYLAND_DISPLAY (gdk_screen_get_display (screen)); GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
GdkWindow *window; GdkWindow *window;
GdkWindowImplWayland *impl; GdkWindowImplWayland *impl;
@ -367,8 +367,8 @@ _gdk_wayland_screen_create_root_window (GdkScreen *screen,
impl->wrapper = GDK_WINDOW (window); impl->wrapper = GDK_WINDOW (window);
if (display_wayland->compositor_version >= WL_SURFACE_HAS_BUFFER_SCALE && if (display_wayland->compositor_version >= WL_SURFACE_HAS_BUFFER_SCALE &&
gdk_screen_get_n_monitors (screen) > 0) gdk_display_get_n_monitors (display) > 0)
impl->scale = gdk_screen_get_monitor_scale_factor (screen, 0); impl->scale = gdk_monitor_get_scale_factor (gdk_display_get_monitor (display, 0));
/* logical 1x1 fake buffer */ /* logical 1x1 fake buffer */
impl->staging_cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, impl->staging_cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
@ -688,8 +688,8 @@ _gdk_wayland_display_create_window_impl (GdkDisplay *display,
/* More likely to be right than just assuming 1 */ /* More likely to be right than just assuming 1 */
if (display_wayland->compositor_version >= WL_SURFACE_HAS_BUFFER_SCALE && if (display_wayland->compositor_version >= WL_SURFACE_HAS_BUFFER_SCALE &&
gdk_screen_get_n_monitors (screen) > 0) gdk_display_get_n_monitors (display) > 0)
impl->scale = gdk_screen_get_monitor_scale_factor (screen, 0); impl->scale = gdk_monitor_get_scale_factor (gdk_display_get_monitor (display, 0));
impl->title = NULL; impl->title = NULL;
@ -1448,11 +1448,11 @@ gdk_wayland_window_create_xdg_toplevel (GdkWindow *window)
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
const gchar *app_id; const gchar *app_id;
GdkScreen *screen = gdk_window_get_screen (window); GdkDisplay *display = gdk_window_get_display (window);
struct wl_output *fullscreen_output = NULL; struct wl_output *fullscreen_output = NULL;
if (impl->initial_fullscreen_monitor >= 0 && if (impl->initial_fullscreen_monitor >= 0 &&
impl->initial_fullscreen_monitor < gdk_screen_get_n_monitors (screen)) impl->initial_fullscreen_monitor < gdk_display_get_n_monitors (display))
fullscreen_output = _gdk_wayland_screen_get_wl_output (screen, impl->initial_fullscreen_monitor); fullscreen_output = _gdk_wayland_screen_get_wl_output (gdk_window_get_screen (window), impl->initial_fullscreen_monitor);
impl->display_server.xdg_surface = impl->display_server.xdg_surface =
zxdg_shell_v6_get_xdg_surface (display_wayland->xdg_shell, zxdg_shell_v6_get_xdg_surface (display_wayland->xdg_shell,