fixed graph not fitting well in the central region.

[psensor.git] / src / ui_pref.c

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 7469aef..55e2bb2 100644 (file)
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -21,6 +21,7 @@
 
 #include <ui.h>
 #include <cfg.h>
+#include <graph.h>
 #include <ui_pref.h>
 #include <ui_color.h>
 #include <pxdg.h>
@@ -29,9 +30,9 @@ GdkRGBA color_to_GdkRGBA(struct color *color)
 {
        GdkRGBA c;
 
-       c.red = color->f_red;
-       c.green = color->f_green;
-       c.blue = color->f_blue;
+       c.red = color->red;
+       c.green = color->green;
+       c.blue = color->blue;
        c.alpha = 1.0;
 
        return c;
@@ -70,7 +71,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
        if (!ok) {
                log_printf(LOG_ERR, error->message);
                g_error_free(error);
-               return ;
+               return;
        }
 
        diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
@@ -179,11 +180,15 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
                gtk_color_chooser_get_rgba(w_color_fg, &color);
                color_set(cfg->graph_fgcolor,
-                         color.red, color.green, color.blue);
+                         color.red,
+                         color.green,
+                         color.blue);
 
                gtk_color_chooser_get_rgba(w_color_bg, &color);
                color_set(cfg->graph_bgcolor,
-                         color.red, color.green, color.blue);
+                         color.red,
+                         color.green,
+                         color.blue);
 
                value = gtk_range_get_value(GTK_RANGE(w_bg_opacity));
                cfg->graph_bg_alpha = value;
@@ -225,10 +230,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
                    = gtk_spin_button_get_value_as_int
                        (w_monitoring_duration);
 
-               cfg->sensor_values_max_length
-                   = (cfg->graph_monitoring_duration * 60) /
-                   cfg->sensor_update_interval;
-
                cfg->hide_on_startup
                        = gtk_toggle_button_get_active(w_hide_on_startup);
 
@@ -244,6 +245,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
                cfg->temperature_unit
                        = gtk_combo_box_get_active(GTK_COMBO_BOX(w_temp_unit));
 
+               cfg->sensor_values_max_length = compute_values_max_length(cfg);
+
                config_save(cfg);
 
                pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));