Messaging Menu

Merge lp:~ted/indicator-messages/gutter-fix into lp:indicator-messages/0.5

  1. gutter-fix
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 229
Proposed branch: lp:~ted/indicator-messages/gutter-fix
Merge into: lp:indicator-messages/0.5
Diff against target: 71 lines (+5/-13)
2 files modified
src/indicator-messages.c (+5/-12)
src/messages-service.c (+0/-1)
To merge this branch: bzr merge lp:~ted/indicator-messages/gutter-fix
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Indicator Applet Developers Pending
Review via email: mp+72819@code.launchpad.net

Description of the change

Make it so that we align the text with all the entires in the menu.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

asl long as the visuals are ok, the logic looks fine. why did you remove <libdbusmenu-glib/menuitem-proxy.h>?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-messages.c'
2--- src/indicator-messages.c 2011-08-17 16:46:28 +0000
3+++ src/indicator-messages.c 2011-08-25 02:41:17 +0000
4@@ -581,11 +581,6 @@
5 GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
6 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
7
8- gint padding = 4;
9- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
10-
11- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
12-
13 /* Set the minimum size, we always want it to take space */
14 gint width, height;
15 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
16@@ -602,12 +597,10 @@
17 /* Application name in a label */
18 GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
19 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
20- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
21 gtk_widget_show(label);
22
23 /* Insert the hbox */
24- gtk_container_add(GTK_CONTAINER(gmi), hbox);
25- gtk_widget_show(hbox);
26+ gtk_container_add(GTK_CONTAINER(gmi), label);
27
28 /* Attach some of the standard GTK stuff */
29 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
30@@ -698,9 +691,9 @@
31
32 gint padding = 4;
33 gint font_size = RIGHT_LABEL_FONT_SIZE;
34- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
35+ gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
36
37- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
38+ GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
39
40 /* Icon, probably someone's face or avatar on an IM */
41 mi_data->icon = gtk_image_new();
42@@ -735,7 +728,7 @@
43 }
44 }
45 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
46- gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
47+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
48
49 if (pixbuf != NULL) {
50 gtk_widget_show(mi_data->icon);
51@@ -744,7 +737,7 @@
52 /* Label, probably a username, chat room or mailbox name */
53 mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
54 gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
55- gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, padding);
56+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
57 gtk_widget_show(mi_data->label);
58
59 /* Usually either the time or the count on the individual
60
61=== modified file 'src/messages-service.c'
62--- src/messages-service.c 2011-08-19 18:36:27 +0000
63+++ src/messages-service.c 2011-08-25 02:41:17 +0000
64@@ -32,7 +32,6 @@
65
66 #include <libdbusmenu-glib/client.h>
67 #include <libdbusmenu-glib/server.h>
68-#include <libdbusmenu-glib/menuitem-proxy.h>
69
70 #include "im-menu-item.h"
71 #include "app-menu-item.h"

Subscribers

People subscribed via source and target branches

to all changes: