From 8479640252e5a1815fd3e10249ffffeae682f62f Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 23 Feb 2014 09:15:01 -0500
Subject: [PATCH] Eeschema: fix build error when using wxWidgets 2.8 and other
 minor fixes.

* Fix string concatenation for _( "Unit" ) + wxT( " " ). This failed
  compiling against wxWidgets 2.8 (thanks Cirilo Bernardo ).
* Base the indentation on a measured observation with explanation
  (98%-ile of name-length found in library). The previously chosen 24
  character indentation was too wide for most.
* Don't use a #define spilling into the global namespace, but use
  a locally defined constant for COLUMN_DESCR_POS.
---
 eeschema/component_tree_search_container.cpp | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eeschema/component_tree_search_container.cpp b/eeschema/component_tree_search_container.cpp
index 11f6bad27a..8c77375cc2 100644
--- a/eeschema/component_tree_search_container.cpp
+++ b/eeschema/component_tree_search_container.cpp
@@ -167,16 +167,19 @@ void COMPONENT_TREE_SEARCH_CONTAINER::AddAliasList( const wxString& aNodeName,
         {
             // Preformatting. Unfortunately, the tree widget doesn't have columns
             // and using tabs does not work very well or does not work at all
-            // (depending on OS versions).
-            #define COLUMN_DESCR_POS 24
-            int len = a->GetName().length();
-            display_info.Clear();
+            // (depending on OS versions). So indent with spaces in fixed-font width.
 
-            if( len <= COLUMN_DESCR_POS )
-                display_info.Append( ' ', COLUMN_DESCR_POS - len );
-
-            display_info += wxString::Format( wxT( " [ %s ]" ),
-                                 GetChars( a->GetDescription() ) );
+            // The 98%-ile of length of strings found in the standard library is 15
+            // characters. Use this as a reasonable cut-off point for aligned indentation.
+            // For the few component names longer than that, the description is indented a
+            // bit more.
+            // The max found in the default lib would be 20 characters, but that creates too
+            // much visible whitespace for the less extreme component names.
+            const int COLUMN_DESCR_POS = 15;
+            const int indent_len = COLUMN_DESCR_POS - a->GetName().length();
+            display_info = wxString::Format( wxT( " %*s [ %s ]" ),
+                                             indent_len > 0 ? indent_len : 0, wxT( "" ),
+                                             GetChars( a->GetDescription() ) );
         }
 
         TREE_NODE* alias_node = new TREE_NODE( TREE_NODE::TYPE_ALIAS, lib_node,
@@ -185,14 +188,13 @@ void COMPONENT_TREE_SEARCH_CONTAINER::AddAliasList( const wxString& aNodeName,
 
         if( a->GetComponent()->IsMulti() )    // Add all units as sub-nodes.
         {
-            wxString unitName;
-
             for( int u = 1; u <= a->GetComponent()->GetPartCount(); ++u )
             {
-                unitName = LIB_COMPONENT::ReturnSubReference( u, false );
+                wxString unitName = _("Unit");
+                unitName += wxT( " " ) + LIB_COMPONENT::ReturnSubReference( u, false );
                 TREE_NODE* unit_node = new TREE_NODE( TREE_NODE::TYPE_UNIT,
                                                       alias_node, a,
-                                                      _("Unit") + wxT( " " ) + unitName,
+                                                      unitName,
                                                       wxEmptyString, wxEmptyString );
                 unit_node->Unit = u;
                 nodes.push_back( unit_node );