File notification-daemon-drawing.patch of Package notification-daemon

Overview Repositories Revisions Requests Users Attributes Meta

File notification-daemon-drawing.patch of Package notification-daemon (Revision 3afcb61243b0ce70f2989e2485d7bb04)

Currently displaying revision 3afcb61243b0ce70f2989e2485d7bb04 , Show latest

Index: themes/bubble/eggnotificationbubblewidget.c
===================================================================
--- themes/bubble/eggnotificationbubblewidget.c	(revision 2487)
+++ themes/bubble/eggnotificationbubblewidget.c	(working copy)
@@ -212,11 +213,9 @@
     gtk_container_remove (GTK_CONTAINER (bubble_widget->table),
                         bubble_widget->button_hbox);
 
-  if (alignment == TRIANGLE_LEFT)
-    {
       gtk_table_attach (GTK_TABLE (bubble_widget->table),
                         bubble_widget->icon,
-                        0, 1, 1, 2,
+                        0, 1, 0, 2,
                         GTK_FILL, GTK_FILL,
                         0, 0);
 
@@ -231,29 +230,8 @@
                         1, 2, 1, 2,
                         GTK_FILL, GTK_FILL,
                         0, 0);
-    }
-  else
-    {
-      gtk_table_attach (GTK_TABLE (bubble_widget->table),
-                        bubble_widget->icon,
-                        1, 2, 1, 2,
-                        GTK_FILL, GTK_FILL,
-                        0, 0);
 
-      gtk_table_attach (GTK_TABLE (bubble_widget->table),
-                        bubble_widget->bubble_widget_header_label,
-                        0, 1, 0, 1,
-                        GTK_FILL, GTK_FILL,
-                        0, 0);
 
-      gtk_table_attach (GTK_TABLE (bubble_widget->table),
-                        bubble_widget->bubble_widget_body_label,
-                        0, 1, 1, 2,
-                        GTK_FILL, GTK_FILL,
-                        0, 0);
-
-    }
-
     if (bubble_widget->button_hbox != NULL)
       {
         GtkWidget *alignment = gtk_alignment_new(1.0, 0.5, 0, 0);
@@ -477,7 +455,7 @@
   //use placeholder so we can use pango/cairo to draw body
   bubble_widget->bubble_widget_body_label = gtk_frame_new("");
   gtk_frame_set_shadow_type (GTK_FRAME (bubble_widget->bubble_widget_body_label), GTK_SHADOW_NONE);
-  bubble_widget->icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
+  bubble_widget->icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_widget_ref (bubble_widget->bubble_widget_header_label);
   gtk_widget_ref (bubble_widget->bubble_widget_body_label);
   gtk_widget_ref (bubble_widget->icon);
@@ -607,7 +585,7 @@
     {
       if (g_str_has_prefix (icon, "file://"))
         {
-          gchar *icon_path = (gchar *) icon + (7 * sizeof (gchar));
+          gchar *icon_path = (gchar *) icon + 7;
           gtk_image_set_from_file (GTK_IMAGE (bubble_widget->icon), icon_path);
         }
       else
@@ -719,7 +697,7 @@
   cairo_set_source_rgba (cr, bw->body_text_color.red,
                              bw->body_text_color.green,
                              bw->body_text_color.blue,
-                             0.60);
+                             1);
   cairo_move_to (cr, event->area.x, event->area.y);
 
   pango_cairo_layout_path (cr, bw->body_layout);
@@ -874,12 +852,12 @@
   bw->offset_x = 0;
   bw->offset_y = 0;
 
-  _edge_line_to (bw, rect->x + rect->width, rect->y, CURVE_LENGTH);
-  _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, CURVE_LENGTH);
+  _edge_line_to (bw, rect->x + rect->width, rect->y, 0);
+  _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, 0);
 
-  _edge_line_to (bw, rect->x, rect->y + rect->height, CURVE_LENGTH);
+  _edge_line_to (bw, rect->x, rect->y + rect->height, 0);
 
-  _edge_line_to (bw, rect->x, rect->y, CURVE_LENGTH);
+  _edge_line_to (bw, rect->x, rect->y, 0);
 
   _close_path (bw);
 
@@ -1008,7 +986,6 @@
 {
   GtkRequisition requisition;
   gint w, h;
-  cairo_pattern_t *pat;
   GdkPixmap *mask;
   GdkPoint arrow_pos;
 
@@ -1044,42 +1021,48 @@
   if (!can_composite)
     g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, mask_cr);
 
-  if (can_composite)
-    cairo_set_source_rgba (cairo_context, 1, 1, 1, 0);
-  else
-    cairo_set_source_rgba (cairo_context,
-                           bubble_widget->border_color.red / 65535.0,
-                           bubble_widget->border_color.green / 65535.0,
-                           bubble_widget->border_color.blue / 65535.0, 1);
-
   cairo_set_operator (cairo_context, CAIRO_OPERATOR_SOURCE);
-  cairo_paint (cairo_context);
 
-  cairo_set_operator (cairo_context, CAIRO_OPERATOR_OVER);
+  cairo_set_source_rgba (cairo_context,
+			 bubble_widget->border_color.red / 65535.0,
+			 bubble_widget->border_color.green / 65535.0,
+			 bubble_widget->border_color.blue / 65535.0, 1);
+  cairo_rectangle (cairo_context, 0, 0, w, h);
+  cairo_fill (cairo_context);
 
-  pat = cairo_pattern_create_linear (0.0, 0.0,  0.0, h);
-  //cairo_pattern_add_color_stop_rgba (pat, 1, 0.59, 0.76, 0.93, 1);
-  cairo_pattern_add_color_stop_rgba (pat, 0,
-                                     bubble_widget->bg_start_gradient.red /
-                                     65535.0,
-                                     bubble_widget->bg_start_gradient.green /
-                                     65535.0,
-                                     bubble_widget->bg_start_gradient.blue /
-                                     65535.0, 1);
+  cairo_set_operator (cairo_context, CAIRO_OPERATOR_ADD);
 
-  cairo_pattern_add_color_stop_rgba (pat, 1,
-                                     bubble_widget->bg_end_gradient.red /
-                                     65535.0,
-                                     bubble_widget->bg_end_gradient.green /
-                                     65535.0,
-                                     bubble_widget->bg_end_gradient.blue /
-                                     65535.0, 1);
+  cairo_set_source_rgba (cairo_context,
+			 bubble_widget->bg_start_gradient.red / 65535.0,
+			 bubble_widget->bg_start_gradient.green / 65535.0,
+			 bubble_widget->bg_start_gradient.blue / 65535.0, 1);
+  cairo_rectangle (cairo_context, 1, 1, w - 2, h - 2);
+  cairo_fill (cairo_context);
 
-  cairo_set_source (cairo_context, pat);
+  cairo_set_operator (cairo_context, CAIRO_OPERATOR_SOURCE);
+
+  switch (bubble_widget->urgency)
+    {
+    case 0:
+      cairo_set_source_rgba (cairo_context, 0.62, 0.69, 0.16, 1);
+      cairo_rectangle (cairo_context, 2, 2, 32, h - 4);
+      cairo_fill (cairo_context);
+      break;
+    case 2:
+      cairo_set_source_rgba (cairo_context, 0.80, 0, 0, 1);
+      cairo_rectangle (cairo_context, 2, 2, 32, h - 4);
+      cairo_fill (cairo_context);
+      break;
+    default:
+      cairo_set_source_rgba (cairo_context, 0.45, 0.62, 0.81, 1);
+      cairo_rectangle (cairo_context, 2, 2, 32, h - 4);
+      cairo_fill (cairo_context);
+      break;
+    }
+
   cairo_fill_preserve (cairo_context);
-  cairo_pattern_destroy (pat);
 
-  cairo_set_line_width (cairo_context, 3.5);
+  cairo_set_line_width (cairo_context, 2);
   cairo_set_source_rgba (cairo_context, 0.43, 0.49, 0.55, 1);
   cairo_stroke (cairo_context);
 
@@ -1211,3 +1194,4 @@
   if (data)
     bubble_widget->urgency = g_value_get_uchar (data);
 }
+
Index: src/daemon.c
===================================================================
--- src/daemon.c	(revision 2487)
+++ src/daemon.c	(working copy)
@@ -781,13 +781,9 @@
 
 	if (use_pos_data)
 	{
-		/*
-		 * Typically, the theme engine will set its own position based on
-		 * the arrow X, Y hints. However, in case, move the notification to
-		 * that position.
-		 */
-		theme_set_notification_arrow(nw, TRUE, x, y);
-		theme_move_notification(nw, x, y);
+		theme_set_notification_arrow(nw, FALSE, 0, 0);
+		_notify_daemon_add_bubble_to_poptart_stack(daemon, nw,
+							   new_notification);
 	}
 	else
 	{

Places

File notification-daemon-drawing.patch of Package notification-daemon (Revision 3afcb61243b0ce70f2989e2485d7bb04)

Places