diff options
| author | Pablo Barciela <[email protected]> | 2017-12-07 01:37:08 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-12-17 12:22:49 +0100 |
| commit | 10b38211e032738593dfe71176289c275956b476 (patch) | |
| tree | 26b8b3026ca845e790439449f720c5611747f9ec /mate-panel/panel-toplevel.c | |
| parent | 54a0b4dcb0b2462eea51cdbcbe8306f25e8e4cea (diff) | |
| download | mate-panel-10b38211e032738593dfe71176289c275956b476.tar.bz2 mate-panel-10b38211e032738593dfe71176289c275956b476.tar.xz | |
WidthOfScreen and HeightOfScreen implementation
This commit reverts:
https://github.com/mate-desktop/mate-panel/commit/7b2bc7d9f98c6ba8c2c31bdf9605faadb42a7e0e
And it applies an alternative to fix the deprecated functions:
gdk_screen_get_width
gdk_screen_get_height
Diffstat (limited to 'mate-panel/panel-toplevel.c')
| -rw-r--r-- | mate-panel/panel-toplevel.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index c95bc641..7aa61e42 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -32,6 +32,7 @@ #include <string.h> #include <gtk/gtk.h> +#include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> @@ -277,19 +278,14 @@ gboolean panel_toplevel_is_last_unattached(PanelToplevel* toplevel) static GdkScreen* panel_toplevel_get_screen_geometry(PanelToplevel* toplevel, int* width, int* height) { GdkScreen* screen; - gint screen_width; - gint screen_height; g_return_val_if_fail(PANEL_IS_TOPLEVEL (toplevel), NULL); g_return_val_if_fail(width != NULL && height != NULL, NULL); screen = gtk_window_get_screen(GTK_WINDOW(toplevel)); - gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, - &screen_width, &screen_height); - - *width = screen_width; - *height = screen_height; + *width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)); + *height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)); return screen; } |