From c4911e303edd2352597ec5879df1137fd0a83274 Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sun, 10 Dec 2017 02:53:45 +0100
Subject: WidthOfScreen and HeightOfScreen implementation
This commit reverts:
https://github.com/mate-desktop/atril/commit/d9fffe2dc0e33d6777099c18635b7b75f54d3d35
And it applies an alternative to fix the deprecated functions:
gdk_screen_get_width
gdk_screen_get_height
---
libview/ev-view-presentation.c | 11 ++++-------
libview/ev-view.c | 11 ++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
(limited to 'libview')
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 1dae35d5..f52dff8b 100644
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include "ev-view-presentation.h"
@@ -720,16 +721,12 @@ ev_view_presentation_goto_window_send_key_event (EvViewPresentation *pview,
{
GdkEventKey *new_event;
GdkScreen *screen;
- gint sc_width;
- gint sc_height;
/* Move goto window off screen */
screen = gtk_widget_get_screen (GTK_WIDGET (pview));
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &sc_width, &sc_height);
-
- gtk_window_move (GTK_WINDOW (pview->goto_window), sc_width + 1, sc_height + 1);
+ gtk_window_move (GTK_WINDOW (pview->goto_window),
+ WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) + 1,
+ HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) + 1);
gtk_widget_show (pview->goto_window);
new_event = (GdkEventKey *) gdk_event_copy (event);
diff --git a/libview/ev-view.c b/libview/ev-view.c
index efd03006..2e8f686c 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -26,6 +26,7 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include "ev-mapping-list.h"
@@ -5723,19 +5724,15 @@ show_loading_window_cb (EvView *view)
if (!view->loading_window) {
GtkWindow *parent;
GdkScreen *screen;
- gint sc_width;
- gint sc_height;
parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
view->loading_window = ev_loading_window_new (parent);
/* Show the window off screen to get a valid size asap */
screen = gtk_widget_get_screen (GTK_WIDGET (view));
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &sc_width, &sc_height);
-
- gtk_window_move (GTK_WINDOW (view->loading_window), sc_width + 1, sc_height + 1);
+ gtk_window_move (GTK_WINDOW (view->loading_window),
+ WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) + 1,
+ HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) + 1);
gtk_widget_show (view->loading_window);
}
--
cgit v1.2.1