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

[Daniel Burrows]

Author: dburrows
Date: Tue Apr 26 01:21:46 2005
New Revision: 3090

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
Log:
Make the max-width calculation more obviously correct.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 01:21:46 2005
@@ -1,5 +1,9 @@
 2005-04-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/fragment.cc:
+
+	  Make the max-width calculation more obviously correct.
+
 	* src/vscreen/vs_text_layout.cc:
 
 	  When the text layout's fragment changes, queue a full layout run

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 01:21:46 2005
@@ -235,13 +235,13 @@
       {
 	rval=max(rval, (*i)->max_width());
 
+	partial+=(*i)->trailing_width();
+
 	if((*i)->final_newline())
 	  {
 	    rval=max(partial, rval);
 	    partial=0;
 	  }
-	else
-	  partial+=(*i)->trailing_width();
       }
 
     rval=max(partial, rval);