diff options
| author | ZenWalker <[email protected]> | 2017-08-07 20:33:08 +0200 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2017-08-13 14:34:57 -0400 |
| commit | 7b2bc7d9f98c6ba8c2c31bdf9605faadb42a7e0e (patch) | |
| tree | b463e4d5b37eaf2e9c34b8b536c2164a6aab5a5b /libmate-panel-applet/mate-panel-applet.c | |
| parent | 8a8ca9c24c7b4d9bec8666dd9a17c5541106bd7e (diff) | |
| download | mate-panel-7b2bc7d9f98c6ba8c2c31bdf9605faadb42a7e0e.tar.bz2 mate-panel-7b2bc7d9f98c6ba8c2c31bdf9605faadb42a7e0e.tar.xz | |
avoid deprecated gdk_screen_get_width/height
Diffstat (limited to 'libmate-panel-applet/mate-panel-applet.c')
| -rw-r--r-- | libmate-panel-applet/mate-panel-applet.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index 3bbaab82..e4a61cf2 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -792,6 +792,8 @@ mate_panel_applet_position_menu (GtkMenu *menu, int menu_y = 0; int pointer_x; int pointer_y; + int screen_width; + int screen_height; g_return_if_fail (PANEL_IS_APPLET (widget)); @@ -815,6 +817,9 @@ mate_panel_applet_position_menu (GtkMenu *menu, menu_x += allocation.x; menu_y += allocation.y; + gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, + &screen_width, &screen_height); + if (applet->priv->orient == MATE_PANEL_APPLET_ORIENT_UP || applet->priv->orient == MATE_PANEL_APPLET_ORIENT_DOWN) { if (gtk_widget_get_direction (GTK_WIDGET (menu)) != GTK_TEXT_DIR_RTL) { @@ -830,9 +835,9 @@ mate_panel_applet_position_menu (GtkMenu *menu, allocation.width - requisition.width); } } - menu_x = MIN (menu_x, gdk_screen_get_width (screen) - requisition.width); + menu_x = MIN (menu_x, screen_width - requisition.width); - if (menu_y > gdk_screen_get_height (screen) / 2) + if (menu_y > screen_height / 2) menu_y -= requisition.height; else menu_y += allocation.height; @@ -840,9 +845,9 @@ mate_panel_applet_position_menu (GtkMenu *menu, if (pointer_y < allocation.height && requisition.height < pointer_y) menu_y += MIN (pointer_y, allocation.height - requisition.height); - menu_y = MIN (menu_y, gdk_screen_get_height (screen) - requisition.height); + menu_y = MIN (menu_y, screen_height - requisition.height); - if (menu_x > gdk_screen_get_width (screen) / 2) + if (menu_x > screen_width / 2) menu_x -= requisition.width; else menu_x += allocation.width; |