[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 02/03: CurveView text overlay: Only add tag-related text if a tag is configured

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

omegaphil pushed a commit to branch master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit da4cc6c40f67e627e3411e731eb16ae40e85c670
Author: OmegaPhil <OmegaPhil at startmail.com>
Date:   Sun Aug 16 15:03:16 2015 +0100

    CurveView text overlay: Only add tag-related text if a tag is configured
---
 src/curve-view.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index c0e2ce4..d84c3d4 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -256,7 +256,7 @@ void CurveView::do_draw_loop()
 {
   double max = 0;
   Glib::ustring max_formatted, max_formatted_compact, monitor_data,
-      monitor_data_compact, text_overlay_format_string,
+      monitor_data_compact, text_overlay_format_string, tag_string,
       separator_string = applet->get_viewer_text_overlay_separator();
   bool graph_max_needed = false, graph_max_compact_needed = false,
       monitor_data_needed = false, monitor_data_compact_needed = false,
@@ -299,29 +299,37 @@ void CurveView::do_draw_loop()
       // Collecting a string of monitor data to overlay later
       if (monitor_data_needed)
       {
+        if (!(*i)->monitor->tag.empty())
+          tag_string = (*i)->monitor->tag + ":" + separator_string;
+        else
+          tag_string = "";
+
         if (monitor_data.empty())
         {
-          monitor_data = (*i)->monitor->tag + ":" + separator_string +
+          monitor_data = tag_string +
                      (*i)->monitor->format_value((*i)->monitor->value(), false);
         }
         else
         {
-          monitor_data.append(separator_string + (*i)->monitor->tag + ":" +
-                              separator_string +
+          monitor_data.append(separator_string + tag_string +
                     (*i)->monitor->format_value((*i)->monitor->value(), false));
         }
       }
       if (monitor_data_compact_needed)
       {
+        if (!(*i)->monitor->tag.empty())
+          tag_string = (*i)->monitor->tag + ":";
+        else
+          tag_string = "";
+
         if (monitor_data_compact.empty())
         {
-          monitor_data_compact = (*i)->monitor->tag + ":" +
+          monitor_data_compact = tag_string +
                       (*i)->monitor->format_value((*i)->monitor->value(), true);
         }
         else
         {
-          monitor_data_compact.append(separator_string + (*i)->monitor->tag +
-                                      ":" +
+          monitor_data_compact.append(separator_string + tag_string +
                      (*i)->monitor->format_value((*i)->monitor->value(), true));
         }
       }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.