From d094cf0297f28b826ca742379750567750dfee9f Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Mon, 4 Dec 2017 09:31:43 +0100 Subject: WidthOfScreen and HeightOfScreen implementation This commit reverts: https://github.com/mate-desktop/marco/commit/f0541e3dfda29c26fe14c9c9117f95c49006c75c https://github.com/mate-desktop/marco/commit/d18c2fb4acb58c408c01700682b9922de86e8b2f And it applies an alternative to fix the deprecated functions: gdk_screen_get_width gdk_screen_width gdk_screen_height --- src/ui/menu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/ui/menu.c') diff --git a/src/ui/menu.c b/src/ui/menu.c index d066ffcb..1bea9232 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -21,6 +21,7 @@ * 02110-1301, USA. */ +#include #include #include #include @@ -103,7 +104,6 @@ static void popup_position_func(GtkMenu* menu, gint* x, gint* y, gboolean* push_ { GtkRequisition req; GdkPoint* pos; - int sc_width, sc_height; pos = user_data; @@ -117,12 +117,9 @@ static void popup_position_func(GtkMenu* menu, gint* x, gint* y, gboolean* push_ *x = MAX (0, *x - req.width); } - gdk_window_get_geometry (gdk_screen_get_root_window (gdk_screen_get_default()), - NULL, NULL, &sc_width, &sc_height); - /* Ensure onscreen */ - *x = CLAMP (*x, 0, MAX(0, sc_width - req.width)); - *y = CLAMP (*y, 0, MAX(0, sc_height - req.height)); + *x = CLAMP (*x, 0, MAX(0, WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - req.width)); + *y = CLAMP (*y, 0, MAX(0, HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - req.height)); } static void menu_closed(GtkMenu* widget, gpointer data) -- cgit v1.2.1