Fixed restoration of the panel divider position.

[psensor.git] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 862ac86..71090aa 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -28,6 +28,7 @@
 
 #include <cfg.h>
 #include <graph.h>
+#include <parray.h>
 #include <plog.h>
 #include <psensor.h>
 
@@ -53,13 +54,26 @@ struct graph_info {
        int height;
        /* Width of the drawing canvas */
        int width;
-
-       /* Background color of the current desktop theme */
-       GdkRGBA theme_bg_color;
-       /* Foreground color of the current desktop theme */
-       GdkRGBA theme_fg_color;
 };
 
+static GtkStyleContext *style;
+/* Foreground color of the current desktop theme */
+static GdkRGBA theme_fg_color;
+/* Background color of the current desktop theme */
+static GdkRGBA theme_bg_color;
+
+static void update_theme(GtkWidget *w)
+{
+       style = gtk_widget_get_style_context(w);
+
+       gtk_style_context_get_background_color(style,
+                                              GTK_STATE_FLAG_NORMAL,
+                                              &theme_bg_color);
+       gtk_style_context_get_color(style,
+                                   GTK_STATE_FLAG_NORMAL,
+                                   &theme_fg_color);
+}
+
 static struct psensor **list_filter_graph_enabled(struct psensor **sensors)
 {
        int n, i;
@@ -161,9 +175,9 @@ static char *time_to_str(time_t s)
 static void draw_left_region(cairo_t *cr, struct graph_info *info)
 {
        cairo_set_source_rgb(cr,
-                            info->theme_bg_color.red,
-                            info->theme_bg_color.green,
-                            info->theme_bg_color.blue);
+                            theme_bg_color.red,
+                            theme_bg_color.green,
+                            theme_bg_color.blue);
 
        cairo_rectangle(cr, 0, 0, info->g_xoff, info->height);
        cairo_fill(cr);
@@ -172,9 +186,9 @@ static void draw_left_region(cairo_t *cr, struct graph_info *info)
 static void draw_right_region(cairo_t *cr, struct graph_info *info)
 {
        cairo_set_source_rgb(cr,
-                            info->theme_bg_color.red,
-                            info->theme_bg_color.green,
-                            info->theme_bg_color.blue);
+                            theme_bg_color.red,
+                            theme_bg_color.green,
+                            theme_bg_color.blue);
 
 
        cairo_rectangle(cr,
@@ -196,15 +210,15 @@ draw_graph_background(cairo_t *cr,
 
        if (config->alpha_channel_enabled)
                cairo_set_source_rgba(cr,
-                                     info->theme_bg_color.red,
-                                     info->theme_bg_color.green,
-                                     info->theme_bg_color.blue,
+                                     theme_bg_color.red,
+                                     theme_bg_color.green,
+                                     theme_bg_color.blue,
                                      config->graph_bg_alpha);
        else
                cairo_set_source_rgb(cr,
-                                    info->theme_bg_color.red,
-                                    info->theme_bg_color.green,
-                                    info->theme_bg_color.blue);
+                                    theme_bg_color.red,
+                                    theme_bg_color.green,
+                                    theme_bg_color.blue);
 
        cairo_rectangle(cr, info->g_xoff, 0, info->g_width, info->height);
        cairo_fill(cr);
@@ -234,7 +248,7 @@ static double dashes[] = {
        1.0,            /* ink */
        2.0,            /* skip */
 };
-static int ndash = sizeof(dashes) / sizeof(dashes[0]);
+static int ndash = ARRAY_SIZE(dashes);
 
 static void draw_background_lines(cairo_t *cr,
                                  int min, int max,
@@ -318,7 +332,8 @@ static void draw_sensor_smooth_curve(struct psensor *s,
        /* search the index of the first measure used as a start point
         * of a Bezier curve. The start and end points of the Bezier
         * curves must be preserved to ensure the same overall shape
-        * of the graph. */
+        * of the graph.
+        */
        i = 0;
        if (stimes) {
                while (i < s->values_max_length) {
@@ -473,12 +488,14 @@ graph_update(struct psensor **sensors,
        cairo_text_extents_t te_btime, te_etime, te_max, te_min;
        struct psensor **sensor_cur, **enabled_sensors;
        GtkAllocation galloc;
-       GtkStyleContext *style_ctx;
        struct graph_info info;
 
        if (!gtk_widget_is_drawable(w_graph))
                return;
 
+       if (!style)
+               update_theme(window);
+
        enabled_sensors = list_filter_graph_enabled(sensors);
 
        min_rpm = get_min_rpm(enabled_sensors);
@@ -540,14 +557,6 @@ graph_update(struct psensor **sensors,
 
        info.g_xoff = g_xoff;
 
-       style_ctx = gtk_widget_get_style_context(window);
-       gtk_style_context_get_background_color(style_ctx,
-                                              GTK_STATE_FLAG_NORMAL,
-                                              &info.theme_bg_color);
-       gtk_style_context_get_color(style_ctx,
-                                   GTK_STATE_FLAG_NORMAL,
-                                   &info.theme_fg_color);
-
        g_width = width - g_xoff - GRAPH_H_PADDING;
        info.g_width = g_width;
 
@@ -555,9 +564,9 @@ graph_update(struct psensor **sensors,
 
        /* Set the color for text drawing */
        cairo_set_source_rgb(cr,
-                            info.theme_fg_color.red,
-                            info.theme_fg_color.green,
-                            info.theme_fg_color.blue);
+                            theme_fg_color.red,
+                            theme_fg_color.green,
+                            theme_fg_color.blue);
 
        /* draw graph begin time */
        cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING);
@@ -621,9 +630,9 @@ graph_update(struct psensor **sensors,
 
        /* draw min and max temp */
        cairo_set_source_rgb(cr,
-                            info.theme_fg_color.red,
-                            info.theme_fg_color.green,
-                            info.theme_fg_color.blue);
+                            theme_fg_color.red,
+                            theme_fg_color.green,
+                            theme_fg_color.blue);
 
        cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING);
        cairo_show_text(cr, strmax);