projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5869437
)
avoid retrieval of theme information.
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 12 Sep 2014 19:59:53 +0000
(21:59 +0200)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 12 Sep 2014 19:59:53 +0000
(21:59 +0200)
src/graph.c
patch
|
blob
|
history
diff --git
a/src/graph.c
b/src/graph.c
index
6cc8097
..
79b9d6f
100644
(file)
--- a/
src/graph.c
+++ b/
src/graph.c
@@
-132,30
+132,23
@@
draw_graph_background(cairo_t *cr,
int g_xoff, int g_yoff,
int g_width, int g_height,
int width, int height, struct config *config,
int g_xoff, int g_yoff,
int g_width, int g_height,
int width, int height, struct config *config,
-
GtkWidget *window
)
+
struct graph_info *info
)
{
{
- GtkStyleContext *style_ctx;
struct color *bgcolor;
struct color *bgcolor;
- GdkRGBA rgba;
bgcolor = config->graph_bgcolor;
bgcolor = config->graph_bgcolor;
- style_ctx = gtk_widget_get_style_context(window);
- gtk_style_context_get_background_color(style_ctx,
- GTK_STATE_FLAG_NORMAL,
- &rgba);
-
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
-
rgba
.red,
-
rgba
.green,
-
rgba
.blue,
+
info->theme_bg_color
.red,
+
info->theme_bg_color
.green,
+
info->theme_bg_color
.blue,
config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
-
rgba
.red,
-
rgba
.green,
-
rgba
.blue);
+
info->theme_bg_color
.red,
+
info->theme_bg_color
.green,
+
info->theme_bg_color
.blue);
cairo_rectangle(cr, g_xoff, 0, g_width, height);
cairo_fill(cr);
cairo_rectangle(cr, g_xoff, 0, g_width, height);
cairo_fill(cr);
@@
-486,7
+479,7
@@
graph_update(struct psensor **sensors,
draw_graph_background(cr,
g_xoff, g_yoff, g_width, g_height,
width, height, config,
draw_graph_background(cr,
g_xoff, g_yoff, g_width, g_height,
width, height, config,
-
window
);
+
&info
);
/* Set the color for text drawing */
cairo_set_source_rgb(cr,
/* Set the color for text drawing */
cairo_set_source_rgb(cr,