Skip to content

Commit

Permalink
GTK 3.23: don't cut tray icons too narrow in HiDPI mode
Browse files Browse the repository at this point in the history
Code required to avoid spaces between tray icons with GTK 3.22 cuts tray icons in half with window-scaling=2 in GTK 3.23
  • Loading branch information
lukefromdc authored and raveit65 committed Jul 28, 2018
1 parent a5a079b commit b8c0dde
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions applets/notification_area/system-tray/na-tray-child.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ na_tray_child_style_set (GtkWidget *widget,
*/
}

#if !GTK_CHECK_VERSION (3, 23, 0)
static void
na_tray_child_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
Expand Down Expand Up @@ -156,6 +157,7 @@ na_tray_child_get_preferred_height (GtkWidget *widget,
*minimal_height = *minimal_height / scale;
*natural_height = *natural_height / scale;
}
#endif

/* The plug window should completely occupy the area of the child, so we won't
* get an expose event. But in case we do (the plug unmaps itself, say), this
Expand Down Expand Up @@ -382,8 +384,10 @@ na_tray_child_class_init (NaTrayChildClass *klass)

widget_class->style_set = na_tray_child_style_set;
widget_class->realize = na_tray_child_realize;
#if !GTK_CHECK_VERSION (3, 23, 0)
widget_class->get_preferred_width = na_tray_child_get_preferred_width;
widget_class->get_preferred_height = na_tray_child_get_preferred_height;
#endif
widget_class->draw = na_tray_child_draw;

/* we don't really care actually */
Expand Down

0 comments on commit b8c0dde

Please sign in to comment.