[gimp/gimp-2-10] app: more fixes to last dashboard commit

[Ell <ell src gnome org>]

commit 3e842e803325d1834d691ab0f33816a738fcf589
Author: Ell <ell_se yahoo com>
Date:   Thu Jun 21 07:36:52 2018 -0400

    app: more fixes to last dashboard commit
    
    Don't show percentage for the swap read/written fields, and make
    sure their history underlays are displayed correctly even if the
    swap limit changes.
    
    (cherry picked from commit fda671841c7baaeb57ce14686122955b94621a24)

 app/widgets/gimpdashboard.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c
index 408c593e18..86a27af709 100644
--- a/app/widgets/gimpdashboard.c
+++ b/app/widgets/gimpdashboard.c
@@ -679,14 +679,14 @@ static const GroupInfo groups[] =
                             .default_active   = FALSE,
                             .show_in_header   = FALSE,
                             .meter_variable   = VARIABLE_SWAP_READING,
-                            .meter_value      = 1
+                            .meter_value      = 2
                           },
 
                           { .variable         = VARIABLE_SWAP_WRITTEN,
                             .default_active   = FALSE,
                             .show_in_header   = FALSE,
                             .meter_variable   = VARIABLE_SWAP_WRITING,
-                            .meter_value      = 2
+                            .meter_value      = 1
                           },
 
                           {}
@@ -1584,11 +1584,9 @@ gimp_dashboard_sample (GimpDashboard *dashboard)
                                                                  variable);
 
                       if (variables[variable].type == VARIABLE_TYPE_BOOLEAN &&
-                          group_info->meter_limit                           &&
                           value)
                         {
-                          value = gimp_dashboard_variable_to_double (
-                            dashboard, group_info->meter_limit);
+                          value = G_MAXDOUBLE;
                         }
 
                       if (field_info->meter_cumulative)
@@ -2973,9 +2971,10 @@ gimp_dashboard_field_to_string (GimpDashboard *dashboard,
           break;
         }
 
-      if (show_limit               &&
-          variable_data->available &&
-          field_info->meter_value  &&
+      if (show_limit                   &&
+          variable_data->available     &&
+          field_info->meter_value      &&
+          ! field_info->meter_variable &&
           group_data->limit)
         {
           gdouble  value;