From 3e4972ba4b2e1bd253d290a5783c0e0d483555e6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 7 Jan 2014 22:23:39 -0500
Subject: [PATCH] Bug #1476

- #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
---
 ChangeLog                  | 1 +
 src/columns/ColDepends.cpp | 3 ++-
 src/columns/ColRecur.cpp   | 3 ++-
 src/columns/ColStart.cpp   | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6be9d177c..d557b44c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,7 @@ Bugs
  + #1414 Client does not verify SSL certificates (thanks to Scott Kroll).
  + #1415 Client should not require a SSL certificate if the server has a trusted
    certificate (thanks to Scott Kroll).
+ + #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
  + Fixed bug so that 'limit:page' now considers footnote messages.
  + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
    (thanks to greenskeleton).
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 4367be45d..dc24e6ade 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -30,6 +30,7 @@
 #include <Context.h>
 #include <ColDepends.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 #include <main.h>
 
@@ -83,7 +84,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
   std::vector <Task> blocking;
   dependencyGetBlocking (task, blocking);
 
-       if (_style == "indicator") minimum = maximum = context.config.get ("dependency.indicator").length ();
+       if (_style == "indicator") minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
   else if (_style == "count")     minimum = maximum = 2 + format ((int) blocking.size ()).length ();
   else if (_style == "default" ||
            _style == "list")
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 5ec1fa3f8..7632bf7e2 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -30,6 +30,7 @@
 #include <Duration.h>
 #include <ColRecur.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 
 extern Context context;
@@ -87,7 +88,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
   else if (_style == "indicator")
   {
     if (task.has (_name))
-      minimum = maximum = context.config.get ("recurrence.indicator").length ();
+      minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
   }
   else
     throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index f9e3fd861..6517e8a78 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -29,6 +29,7 @@
 #include <Context.h>
 #include <ColStart.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 
 extern Context context;
@@ -77,7 +78,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     if (_style == "active")
     {
       if (! task.has ("end"))
-        minimum = maximum = context.config.get ("active.indicator").length ();
+        minimum = maximum = utf8_width (context.config.get ("active.indicator"));
     }
     else
       ColumnDate::measure (task, minimum, maximum);