[X2Go-Commits] [x2goclient] 01/01: help.cpp: hardcode indentation value to 2 (for the first spaces) + maximum length of parameters + 4 (for the trailing 4 spaces).

git-admin at x2go.org git-admin at x2go.org
Thu Apr 23 02:25:29 CEST 2015


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

x2go pushed a commit to branch bugfix/help-cmd
in repository x2goclient.

commit b2024e46a86e805680e38e9c92a26d4cd727ac84
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 23 02:24:58 2015 +0200

    help.cpp: hardcode indentation value to 2 (for the first spaces) + maximum length of parameters + 4 (for the trailing 4 spaces).
    
    Calculations via terminal_cols and remaining do not work, if
    terminal_cols is unknown.
---
 debian/changelog |    4 ++++
 src/help.cpp     |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71ed3eb..79c83c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -286,6 +286,10 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - help.cpp: trying to split at hyphens was a bad idea. Remove that part.
     - help.cpp: fix a compile warning (by including winsock2.h) and error
       (caused by a typo) on Windows.
+    - help.cpp: hardcode indentation value to 2 (for the first spaces) +
+      maximum length of parameters + 4 (for the trailing 4 spaces).
+      Calculations via terminal_cols and remaining do not work, if
+      terminal_cols is unknown.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/help.cpp b/src/help.cpp
index 2ac08e4..fb44394 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -278,7 +278,7 @@ QString help::pretty_print (help::data_t data) {
 
       /* Add whitespace if description shall continue on next line. */
       if ((desc_split_it + 1) != desc_split.constEnd ()) {
-        indent = terminal_cols - remaining;
+        indent = 2 + max_len + 4;
         out << QString (" ").repeated (indent);
       }
     }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list