summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-03-20 22:02:48 -0400
committerlukefromdc <[email protected]>2018-03-20 22:02:48 -0400
commit0b15ea1f6d218cc2a850bef3f0cb98d303c63bc3 (patch)
treebba116cfd9d1eafd505519762837d40fa4725e3d
parentff04f332136272a14c588da3f2d582ba0ff01be1 (diff)
downloadmate-panel-0b15ea1f6d218cc2a850bef3f0cb98d303c63bc3.tar.bz2
mate-panel-0b15ea1f6d218cc2a850bef3f0cb98d303c63bc3.tar.xz
hidpi: fix tray icon spacing with window-scaling > 1
-rw-r--r--applets/notification_area/system-tray/na-tray-child.c10
-rw-r--r--applets/notification_area/system-tray/na-tray.c3
2 files changed, 12 insertions, 1 deletions
diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c
index 46e6e412..47a45e90 100644
--- a/applets/notification_area/system-tray/na-tray-child.c
+++ b/applets/notification_area/system-tray/na-tray-child.c
@@ -120,6 +120,8 @@ na_tray_child_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
gint *natural_width)
{
+ gint scale;
+ scale = gtk_widget_get_scale_factor (widget);
GTK_WIDGET_CLASS (na_tray_child_parent_class)->get_preferred_width (widget,
minimal_width,
natural_width);
@@ -129,6 +131,9 @@ na_tray_child_get_preferred_width (GtkWidget *widget,
if (*natural_width < 16)
*natural_width = 16;
+
+ *minimal_width = *minimal_width / scale;
+ *natural_width = *natural_width / scale;
}
static void
@@ -136,6 +141,8 @@ na_tray_child_get_preferred_height (GtkWidget *widget,
gint *minimal_height,
gint *natural_height)
{
+ gint scale;
+ scale = gtk_widget_get_scale_factor (widget);
GTK_WIDGET_CLASS (na_tray_child_parent_class)->get_preferred_height (widget,
minimal_height,
natural_height);
@@ -145,6 +152,9 @@ na_tray_child_get_preferred_height (GtkWidget *widget,
if (*natural_height < 16)
*natural_height = 16;
+
+ *minimal_height = *minimal_height / scale;
+ *natural_height = *natural_height / scale;
}
static void
diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c
index 94fe6911..621d534d 100644
--- a/applets/notification_area/system-tray/na-tray.c
+++ b/applets/notification_area/system-tray/na-tray.c
@@ -127,7 +127,8 @@ tray_added (NaTrayManager *manager,
na_host_emit_item_added (NA_HOST (tray), NA_ITEM (icon));
- gtk_widget_show (GTK_WIDGET (icon));
+ /*Does not seem to be needed anymore and can cause a render issue with hidpi*/
+ /*gtk_widget_show (GTK_WIDGET (icon));*/
}
static void