Doing dynamic size calculation based on the font if we have a prop set telling us to do so.

1 files changed, 15 insertions, 1 deletions

diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c
index 3e8c627..76ac3c2 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libindicator/indicator-image-helper.c
@@ -15,8 +15,22 @@ refresh_image (GtkImage * image)
 	GtkIconTheme * default_theme = gtk_icon_theme_get_default();
 	g_return_if_fail(default_theme != NULL);
 
+	gint icon_size = 22;
+
+	GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(image));
+	GValue styleprop = {0};
+	gtk_style_get_style_property(style, GTK_TYPE_IMAGE, "x-ayatana-indicator-dynamic", &styleprop);
+
+	if (G_VALUE_HOLDS_BOOLEAN(&styleprop) && g_value_get_boolean(&styleprop)) {
+		PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(image));
+		PangoFontMetrics * metrics = pango_context_get_metrics(context, style->font_desc, pango_context_get_language(context));
+		icon_size = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics)) + PANGO_PIXELS(pango_font_metrics_get_descent(metrics));
+		g_debug("Looking for icon size %d", icon_size);
+		pango_font_metrics_unref(metrics);
+	}
+
 	/* Look through the themes for that icon */
-	GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, 22, 0);
+	GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0);
 	if (icon_info == NULL) {
 		g_warning("Unable to find icon in theme.");
 		return;