ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #03836
[Merge] lp:~ted/indicator-messages/gutter-fix into lp:indicator-messages
Ted Gould has proposed merging lp:~ted/indicator-messages/gutter-fix into lp:indicator-messages.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~ted/indicator-messages/gutter-fix/+merge/72819
Make it so that we align the text with all the entires in the menu.
--
https://code.launchpad.net/~ted/indicator-messages/gutter-fix/+merge/72819
Your team ayatana-commits is subscribed to branch lp:indicator-messages.
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-08-17 16:46:28 +0000
+++ src/indicator-messages.c 2011-08-25 02:41:17 +0000
@@ -581,11 +581,6 @@
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
- gint padding = 4;
- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
-
- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
-
/* Set the minimum size, we always want it to take space */
gint width, height;
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
@@ -602,12 +597,10 @@
/* Application name in a label */
GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
gtk_widget_show(label);
/* Insert the hbox */
- gtk_container_add(GTK_CONTAINER(gmi), hbox);
- gtk_widget_show(hbox);
+ gtk_container_add(GTK_CONTAINER(gmi), label);
/* Attach some of the standard GTK stuff */
dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
@@ -698,9 +691,9 @@
gint padding = 4;
gint font_size = RIGHT_LABEL_FONT_SIZE;
- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
+ gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
/* Icon, probably someone's face or avatar on an IM */
mi_data->icon = gtk_image_new();
@@ -735,7 +728,7 @@
}
}
gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
if (pixbuf != NULL) {
gtk_widget_show(mi_data->icon);
@@ -744,7 +737,7 @@
/* Label, probably a username, chat room or mailbox name */
mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, padding);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
gtk_widget_show(mi_data->label);
/* Usually either the time or the count on the individual
=== modified file 'src/messages-service.c'
--- src/messages-service.c 2011-08-19 18:36:27 +0000
+++ src/messages-service.c 2011-08-25 02:41:17 +0000
@@ -32,7 +32,6 @@
#include <libdbusmenu-glib/client.h>
#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem-proxy.h>
#include "im-menu-item.h"
#include "app-menu-item.h"
Follow ups