DBus Menu

Merge lp:~ted/libdbusmenu/icon-padding into lp:libdbusmenu/0.5

  1. icon-padding
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/libdbusmenu/icon-padding
Merge into: lp:libdbusmenu/0.5
Diff against target: 57 lines (+15/-4)
1 file modified
libdbusmenu-gtk/genericmenuitem.c (+15/-4)
To merge this branch: bzr merge lp:~ted/libdbusmenu/icon-padding
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+17157@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Adding a check of the horizontal padding and using that to space out the
icon and the label.

Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
2--- libdbusmenu-gtk/genericmenuitem.c 2009-12-17 21:49:27 +0000
3+++ libdbusmenu-gtk/genericmenuitem.c 2010-01-11 19:20:30 +0000
4@@ -143,6 +143,17 @@
5 return;
6 }
7
8+/* A quick little function to grab the padding from the
9+ style. It should be considered for caching when
10+ optimizing. */
11+static gint
12+get_hpadding (GtkWidget * widget)
13+{
14+ gint padding = 0;
15+ gtk_widget_style_get(widget, "horizontal-padding", &padding, NULL);
16+ return padding;
17+}
18+
19 /* Set the label on the item */
20 static void
21 set_label (GtkMenuItem * menu_item, const gchar * label)
22@@ -166,7 +177,7 @@
23 GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
24 g_object_ref(child);
25 gtk_container_remove(GTK_CONTAINER(menu_item), child);
26- gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, 0);
27+ gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, get_hpadding(GTK_WIDGET(menu_item)));
28 gtk_container_add(GTK_CONTAINER(menu_item), hbox);
29 gtk_widget_show(hbox);
30 g_object_unref(child);
31@@ -190,7 +201,7 @@
32 if (child == NULL) {
33 gtk_container_add(GTK_CONTAINER(menu_item), GTK_WIDGET(labelw));
34 } else {
35- gtk_box_pack_end(GTK_BOX(child), GTK_WIDGET(labelw), TRUE, TRUE, 0);
36+ gtk_box_pack_end(GTK_BOX(child), GTK_WIDGET(labelw), TRUE, TRUE, get_hpadding(GTK_WIDGET(menu_item)));
37 }
38 } else {
39 /* Oh, just an update. No biggie. */
40@@ -383,7 +394,7 @@
41 GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
42 g_object_ref(child);
43 gtk_container_remove(GTK_CONTAINER(menu_item), child);
44- gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, 0);
45+ gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, get_hpadding(GTK_WIDGET(menu_item)));
46 gtk_container_add(GTK_CONTAINER(menu_item), hbox);
47 gtk_widget_show(hbox);
48 g_object_unref(child);
49@@ -405,7 +416,7 @@
50 if (child == NULL) {
51 gtk_container_add(GTK_CONTAINER(menu_item), GTK_WIDGET(image));
52 } else {
53- gtk_box_pack_start(GTK_BOX(child), GTK_WIDGET(image), FALSE, FALSE, 0);
54+ gtk_box_pack_start(GTK_BOX(child), GTK_WIDGET(image), FALSE, FALSE, get_hpadding(GTK_WIDGET(menu_item)));
55 }
56
57 gtk_widget_show(image);

Subscribers

People subscribed via source and target branches