[Aptitude-devel] r3096 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Tue Apr 26 15:09:48 2005
New Revision: 3096

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
Log:
Adjust the width calculation of sequences.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 15:09:48 2005
@@ -1,5 +1,9 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/fragment.cc:
+
+	  Slightly fix the way sequence fragments calculate their width.
+
 	* src/solution_fragment.cc:
 
 	  Fix some missing newlines in the solution fragment formatting.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	Tue Apr 26 15:09:48 2005
@@ -261,13 +261,10 @@
       {
 	rval=max(rval, (*i)->max_width(partial, rest_indent));
 
-	partial=(*i)->trailing_width(partial, rest_indent);
-
 	if((*i)->final_newline())
-	  {
-	    rval=max(partial, rval);
-	    partial=0;
-	  }
+	  rval=max(partial, rval);
+
+	partial=(*i)->trailing_width(partial, rest_indent);
       }
 
     rval=max(partial, rval);