Merge lp:~larsu/gnome-system-monitor/draw-graph-transparent-background into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

[Lars Karlitski]

Add git_draw-transparent-background.patch

Add git_draw-transparent-background.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-29 19:17:25 +0000
+++ debian/changelog	2014-10-02 11:34:50 +0000
@@ -1,3 +1,9 @@
+gnome-system-monitor (3.8.0-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Add git_draw-transparent-background.patch
+
+ -- Lars Uebernickel <[e-mail]>  Thu, 02 Oct 2014 13:31:52 +0200
+
 gnome-system-monitor (3.8.0-0ubuntu2) saucy; urgency=low
 
   * Add 00git_logind_check.patch: Fix check for logind.
 
=== added file 'debian/patches/git_draw-transparent-background.patch'
--- debian/patches/git_draw-transparent-background.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_draw-transparent-background.patch	2014-10-02 11:34:50 +0000
@@ -0,0 +1,37 @@
+Description: Draw graphs with transparent background
+
+Backport from upstream 6da63ee
+
+--- gnome-system-monitor-3.8.0.orig/src/load-graph.cpp
++++ gnome-system-monitor-3.8.0/src/load-graph.cpp
+@@ -76,7 +76,7 @@ void draw_background(LoadGraph *graph) {
+     PangoLayout* layout;
+     PangoFontDescription* font_desc;
+     PangoRectangle extents;
+-    GdkRGBA fg, bg;
++    GdkRGBA fg;
+ 
+     num_bars = graph->num_bars();
+     graph->graph_dely = (graph->draw_height - 15) / num_bars; /* round to int to avoid AA blur */
+@@ -86,19 +86,15 @@ void draw_background(LoadGraph *graph) {
+ 
+     gtk_widget_get_allocation (graph->disp, &allocation);
+     graph->background = gdk_window_create_similar_surface (gtk_widget_get_window (graph->disp),
+-                                                           CAIRO_CONTENT_COLOR,
++                                                           CAIRO_CONTENT_COLOR_ALPHA,
+                                                            allocation.width,
+                                                            allocation.height);
+     cr = cairo_create (graph->background);
+ 
+     GtkStyleContext *context = gtk_widget_get_style_context (ProcmanApp::get()->notebook);
+-    gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+     gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &fg);
+ 
+-    // set the background colour
+-    gdk_cairo_set_source_rgba (cr, &bg);
+-    cairo_paint (cr);
+-
++    cairo_paint_with_alpha (cr, 0.0);
+     layout = pango_cairo_create_layout (cr);
+     font_desc = pango_font_description_copy (gtk_style_context_get_font (context, GTK_STATE_FLAG_NORMAL));
+     pango_font_description_set_size (font_desc, 0.8 * graph->fontsize * PANGO_SCALE);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-04-29 19:13:35 +0000
+++ debian/patches/series	2014-10-02 11:34:50 +0000
@@ -1,3 +1,4 @@
 # Debian patches for gnome-system-monitor
 00git_logind_check.patch
 quit-accel-fix
+git_draw-transparent-background.patch