Merge lp:~cimi/indicator-messages/right-rounded-numbers into lp:indicator-messages/0.5

[Andrea Cimitan]

Add rounded numbers on the right

[David Barth (dbarth)]

THe patch compiles and runs, but the rendering omits the label. Re-add the gtk_label_new call you suppressed.

On a more general note, you should check all arguments passed to your functions, in particular callbacks. If they are NULL or not of the right type, exit early to avoid de-referencing a pointer (and crashing).

review: Needs Fixing

[lp:~cimi/indicator-messages/right-rounded-numbers]

193. By Andrea Cimitan on 2010-07-29

Ops, readded the label :P

[David Barth (dbarth)]

Something like that:

=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-07-29 11:30:48 +0000
+++ src/indicator-messages.c 2010-07-29 11:36:44 +0000
@@ -314,6 +314,8 @@
  PangoLayout * layout;
  gint font_size = RIGHT_LABEL_FONT_SIZE;

+ if (! GTK_IS_WIDGET (widget)) return;
+
  /* get style */
  style = gtk_widget_get_style (widget);

[lp:~cimi/indicator-messages/right-rounded-numbers]

194. By Andrea Cimitan on 2010-07-29

check if widget is really a widget before getting its style (from dbarth)

[David Barth (dbarth)]

+1 Congrats for your 1st DX merge proposal ;)

review: Approve

[Andrea Cimitan (cimi)]

> +1 Congrats for your 1st DX merge proposal ;)

ahaha ty ;)

=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2010-03-31 05:24:02 +0000
+++ src/indicator-messages.c	2010-07-29 11:41:53 +0000
@@ -44,6 +44,11 @@
 #define IS_INDICATOR_MESSAGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_MESSAGES_TYPE))
 #define INDICATOR_MESSAGES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessagesClass))
 
+#define M_PI 3.1415926535897932384626433832795028841971693993751
+
+#define RIGHT_LABEL_FONT_SIZE 12
+#define RIGHT_LABEL_RADIUS 20
+
 typedef struct _IndicatorMessages      IndicatorMessages;
 typedef struct _IndicatorMessagesClass IndicatorMessagesClass;
 
@@ -285,6 +290,74 @@
 	return;
 }
 
+/* Custom function to draw rounded rectangle with max radius */
+static void
+custom_cairo_rounded_rectangle (cairo_t *cr,
+                                double x, double y, double w, double h)
+{
+	double radius = MIN (w/2.0, h/2.0);
+
+	cairo_move_to (cr, x+radius, y);
+	cairo_arc (cr, x+w-radius, y+radius, radius, M_PI*1.5, M_PI*2);
+	cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, M_PI*0.5);
+	cairo_arc (cr, x+radius,   y+h-radius, radius, M_PI*0.5, M_PI);
+	cairo_arc (cr, x+radius,   y+radius,   radius, M_PI, M_PI*1.5);
+}
+
+/* Draws a rounded rectangle with text inside. */
+static gboolean
+numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+	GtkStyle *style;
+	cairo_t *cr;
+	double x, y, w, h;
+	PangoLayout * layout;
+	gint font_size = RIGHT_LABEL_FONT_SIZE;
+
+	if (!GTK_IS_WIDGET (widget)) return;
+
+	/* get style */
+	style = gtk_widget_get_style (widget);
+
+	/* set arrow position / dimensions */
+	w = widget->allocation.width;
+	h = widget->allocation.height;
+	x = widget->allocation.x;
+	y = widget->allocation.y;
+
+	layout = gtk_label_get_layout (GTK_LABEL(widget));
+
+	/* This does not work, don't ask me why but font_size is 0.
+	 * I wanted to use a dynamic font size to adjust the padding on left/right edges
+	 * of the rounded rectangle. Andrea Cimitan */
+	/* const PangoFontDescription * font_description = pango_layout_get_font_description (layout);
+	font_size = pango_font_description_get_size (font_description); */
+
+	/* initialize cairo drawing area */
+	cr = (cairo_t*) gdk_cairo_create (widget->window);
+
+	/* set line width */	
+	cairo_set_line_width (cr, 1.0);
+
+	cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+	/* cairo drawing code */
+	custom_cairo_rounded_rectangle (cr, x - font_size/2.0, y, w + font_size, h);
+
+	cairo_set_source_rgba (cr, style->fg[gtk_widget_get_state(widget)].red/65535.0,
+	                           style->fg[gtk_widget_get_state(widget)].green/65535.0,
+	                           style->fg[gtk_widget_get_state(widget)].blue/65535.0, 0.5);
+
+	cairo_move_to (cr, x, y);
+	pango_cairo_layout_path (cr, layout);
+	cairo_fill (cr);
+
+	/* remember to destroy cairo context to avoid leaks */
+        cairo_destroy (cr);
+
+	return TRUE;
+}
+
 /* Builds a menu item representing a running application in the
    messaging menu */
 static gboolean
@@ -335,7 +408,6 @@
 	return TRUE;
 }
 
-
 typedef struct _indicator_item_t indicator_item_t;
 struct _indicator_item_t {
 	GtkWidget * icon;
@@ -405,6 +477,7 @@
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
 
 	gint padding = 4;
+	gint font_size = RIGHT_LABEL_FONT_SIZE;
 	gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
 
 	GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
@@ -455,8 +528,16 @@
 	   item. */
 	mi_data->right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT));
 	gtk_size_group_add_widget(indicator_right_group, mi_data->right);
+
+	/* Doesn't work, look numbers_draw_cb. */
+	/* PangoLayout * right_layout = gtk_label_get_layout (GTK_LABEL(mi_data->right));
+	   font_size = pango_font_description_get_size (pango_layout_get_font_description (right_layout)); */
+
+	g_signal_connect (G_OBJECT (mi_data->right), "expose_event",
+	                  G_CALLBACK (numbers_draw_cb), NULL);
+
 	gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, padding);
+	gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, padding + font_size/2.0);
 	gtk_widget_show(mi_data->right);
 
 	gtk_container_add(GTK_CONTAINER(gmi), hbox);