[gnome-panel] addto-dialog: avoid deprecated gdk_screen_get_height
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] addto-dialog: avoid deprecated gdk_screen_get_height
- Date: Sat, 7 Mar 2020 20:55:41 +0000 (UTC)
commit fd9517e6110a03e68793a99831a1b4f1bd9922f1
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Mar 7 22:43:15 2020 +0200
addto-dialog: avoid deprecated gdk_screen_get_height
Use monitor workarea to calculate dialog height.
gnome-panel/panel-addto-dialog.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index 7cf1c7ffc..1193be920 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -1241,7 +1241,10 @@ panel_addto_present (GtkMenuItem *item,
PanelObjectPackType insert_pack_type;
GdkEvent *current_event;
GdkScreen *screen;
- gint screen_height;
+ GdkDisplay *display;
+ GdkWindow *window;
+ GdkMonitor *monitor;
+ GdkRectangle workarea;
gint height;
toplevel = panel_widget->toplevel;
@@ -1254,8 +1257,11 @@ panel_addto_present (GtkMenuItem *item,
panel_addto_dialog_quark);
screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
- screen_height = gdk_screen_get_height (screen);
- height = MIN (MAX_ADDTOPANEL_HEIGHT, 3 * (screen_height / 4));
+ display = gdk_screen_get_display (screen);
+ window = gtk_widget_get_window (GTK_WIDGET (panel_widget));
+ monitor = gdk_display_get_monitor_at_window (display, window);
+ gdk_monitor_get_workarea (monitor, &workarea);
+ height = MIN (MAX_ADDTOPANEL_HEIGHT, 3 * (workarea.height / 4));
if (!dialog) {
dialog = panel_addto_dialog_new (panel_widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]