summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-10-04 14:27:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 10:10:11 +0100
commit28ffbd4e560fccb6e8eb24dc735c0838e9bc7d39 (patch)
treefbf53072394044cececf6849c66c56fc21729ac4
parent389cfd24be7bad870a85181c14807b7d04711cfc (diff)
downloadpoky-28ffbd4e560fccb6e8eb24dc735c0838e9bc7d39.tar.gz
matchbox-panel-2: Fix small systray icon drawing
Add patch to pack systray icons so that their drawing area is the size they expect (otherwise GtkStatusIcon based systray items can end up drawing "tiled", looking like 1.5 icons instead of a single icon). Fixes [YOCTO #9995] (From OE-Core rev: 6db56c4fd1f510a2d9ece30329e04ae591521906) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch34
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb4
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch b/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch
new file mode 100644
index 0000000000..d13dd3d5a0
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch
@@ -0,0 +1,34 @@
1From f83a9179696b2d060ee4860733dafbf38bbd4b87 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 28 Sep 2016 15:05:41 +0300
4Subject: [PATCH] applets/systray: Allow icons to be smaller
5
6Don't expand/fill the systray items, align them in the center of the
7systray panel. This makes sure the icons are drawn at the size they
8expect.
9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11Upstream-Status: Submitted
12---
13 applets/systray/systray.c | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/applets/systray/systray.c b/applets/systray/systray.c
17index 39698a8..94a5753 100644
18--- a/applets/systray/systray.c
19+++ b/applets/systray/systray.c
20@@ -29,8 +29,9 @@ on_realize (GtkWidget *widget, gpointer user_data)
21 tray = (GtkWidget *)na_tray_new_for_screen (screen, orientation);
22
23 gtk_widget_show (tray);
24-
25- gtk_container_add (GTK_CONTAINER (widget), tray);
26+ gtk_widget_set_valign (tray, GTK_ALIGN_CENTER);
27+ gtk_widget_set_halign (tray, GTK_ALIGN_CENTER);
28+ gtk_box_pack_start (GTK_BOX (widget), tray, FALSE, FALSE, 0);
29 }
30
31 G_MODULE_EXPORT GtkWidget *
32--
332.1.4
34
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
index a387073d8f..d38e7f639f 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
@@ -21,7 +21,9 @@ RPROVIDES_${PN} = "matchbox-panel"
21RREPLACES_${PN} = "matchbox-panel" 21RREPLACES_${PN} = "matchbox-panel"
22RCONFLICTS_${PN} = "matchbox-panel" 22RCONFLICTS_${PN} = "matchbox-panel"
23 23
24SRC_URI = "git://git.yoctoproject.org/${BPN}" 24SRC_URI = "git://git.yoctoproject.org/${BPN} \
25 file://0001-applets-systray-Allow-icons-to-be-smaller.patch \
26 "
25 27
26EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 28EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
27EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 29EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"