diff -Nru budgie-indicator-applet-0.4/debian/changelog budgie-indicator-applet-0.4/debian/changelog --- budgie-indicator-applet-0.4/debian/changelog 2017-08-20 12:18:55.000000000 +0100 +++ budgie-indicator-applet-0.4/debian/changelog 2017-09-17 11:33:03.000000000 +0100 @@ -1,3 +1,13 @@ +budgie-indicator-applet (0.4-0ubuntu2) artful; urgency=medium + + * Bug-fix release + - 0001-Style-and-icon-size-fixes-3.patch + Ensure the applet is styled correctly to blend into + the panel + Force resizing of GIcons to appindicator spec of 22px (LP: #1641457) + + -- David Mohammed Wed, 06 Sep 2017 22:28:32 +0100 + budgie-indicator-applet (0.4-0ubuntu1) artful; urgency=medium * New release (LP: #1711928) diff -Nru budgie-indicator-applet-0.4/debian/patches/0001-Style-and-icon-size-fixes-3.patch budgie-indicator-applet-0.4/debian/patches/0001-Style-and-icon-size-fixes-3.patch --- budgie-indicator-applet-0.4/debian/patches/0001-Style-and-icon-size-fixes-3.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-indicator-applet-0.4/debian/patches/0001-Style-and-icon-size-fixes-3.patch 2017-09-17 11:36:39.000000000 +0100 @@ -0,0 +1,92 @@ +Description: styling and icon fixes + This patch fixes two issues: + 1. some appindicators do not correctly size the size of the icon + to the appindicator spec - this patch overrides the given + icon size + 2. With non inbuilt themes, the applet is not styled in the panel + background colour +Author: David Mohammed +Bug-Ubuntu: https://launchpad.net/bugs/1641457 +Applied-Upstream: https://github.com/UbuntuBudgie/budgie-indicator-applet/commit/bcc125d1bdd969897bc7719913afefc64931efe4 +Last-Update: <2017-10-15> + +--- a/src/applet-main.c ++++ b/src/applet-main.c +@@ -216,6 +216,7 @@ + gboolean something_visible = FALSE; + gboolean something_sensitive = FALSE; + GtkStyleContext *context; ++ GtkCssProvider *css_provider = NULL; + GSettings *settings = NULL; + + /* +@@ -249,6 +250,7 @@ + + if (entry->image != NULL) { + g_debug("zzz have an image"); ++ gtk_image_set_pixel_size(entry->image, 22); + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1); + if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) { + g_debug("zzz and is visible"); +@@ -310,6 +312,20 @@ + gtk_style_context_add_class(context, "budgie-menubar"); + context = gtk_widget_get_style_context(GTK_WIDGET(menubar)); + gtk_style_context_remove_class(context, "menubar"); ++ ++ css_provider = gtk_css_provider_new(); ++ gtk_css_provider_load_from_data(css_provider, ++ ".budgie-menubar { \n" ++ " padding-left: 2px; \n" ++ " padding-right: 2px; \n" ++ "} \n", ++ -1, ++ NULL); ++ gtk_style_context_add_provider(GTK_STYLE_CONTEXT(gtk_widget_get_style_context( ++ GTK_WIDGET(menuitem))), ++ GTK_STYLE_PROVIDER(css_provider), ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ + g_debug("zzz adding budgie-menubar"); + + gtk_container_add(GTK_CONTAINER(menuitem), box); +--- a/src/applet.c ++++ b/src/applet.c +@@ -69,10 +69,38 @@ + { + GtkWidget *eventbox = NULL; + GtkWidget *menubar = NULL; ++ GtkCssProvider *css_provider = NULL; + + gint indicators_loaded = 0; + + menubar = gtk_menu_bar_new(); ++ css_provider = gtk_css_provider_new(); ++#if GTK_CHECK_VERSION(3, 20, 0) ++ gtk_css_provider_load_from_data(css_provider, ++ "menubar { \n" ++ " background: transparent; } \n" ++ ".budgie-menubar { \n" ++ " padding-left: 2px; \n" ++ " padding-right: 2px; \n" ++ "} \n", ++ -1, ++ NULL); ++#else ++ gtk_css_provider_load_from_data(css_provider, ++ ".menuitem { \n" ++ " background: transparent; } \n" ++ ".budgie-menubar { \n" ++ " padding-left: 2px; \n" ++ " padding-right: 2px; \n" ++ "} \n", ++ -1, ++ NULL); ++#endif ++ gtk_style_context_add_provider(GTK_STYLE_CONTEXT(gtk_widget_get_style_context( ++ GTK_WIDGET(menubar))), ++ GTK_STYLE_PROVIDER(css_provider), ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ + eventbox = gtk_event_box_new(); + gtk_container_add(GTK_CONTAINER(self), eventbox); + gtk_widget_show(eventbox); diff -Nru budgie-indicator-applet-0.4/debian/patches/series budgie-indicator-applet-0.4/debian/patches/series --- budgie-indicator-applet-0.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ budgie-indicator-applet-0.4/debian/patches/series 2017-09-17 11:33:03.000000000 +0100 @@ -0,0 +1 @@ +0001-Style-and-icon-size-fixes-3.patch