[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/apps/konsole/src
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2010-02-23 5:30:19
Message-ID: 1266903019.164046.27399.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1094735 by hindenburg:

SVN commit 1083161 by hindenburg:

Fix issue where history lines had extra spaces at end.
Thanks to Orion Poplawski for patch.

CCBUG: 188528



 M  +2 -22     Screen.cpp  


--- branches/KDE/4.4/kdebase/apps/konsole/src/Screen.cpp #1094734:1094735
@@ -645,17 +645,10 @@
 
     // ensure current line vector has enough elements
     int size = screenLines[cuY].size();
-    if (size == 0 && cuY > 0)
+    if (size < cuX+w)
     {
-        screenLines[cuY].resize( qMax(screenLines[cuY-1].size() , cuX+w) );
+        screenLines[cuY].resize(cuX+w);
     }
-    else
-    {
-        if (size < cuX+w)
-        {
-            screenLines[cuY].resize(cuX+w);
-        }
-    }
 
     if (getMode(MODE_Insert)) insertChars(w);
 
@@ -1230,19 +1223,6 @@
         Character* data = screenLines[screenLine].data();
         int length = screenLines[screenLine].count();
 
-        // Don't remove end spaces in lines that wrap
-        if (!(lineProperties[screenLine] & LINE_WRAPPED))
-        {
-            // ignore trailing white space at the end of the line
-            for (int i = length-1; i >= 0; i--)
-            {
-                if (data[i].character == ' ')
-                    length--;
-                else
-                    break;
-            }
-        }
- 
         //retrieve line from screen image
         for (int i=start;i < qMin(start+count,length);i++)
         {
[prev in list] [next in list] [prev in thread] [next in thread]