[Aptitude-svn-commit] r3568 - in branches/aptitude-0.3/aptitude: . src

Daniel Burrows dburrows@costa.debian.org
Sat, 02 Jul 2005 18:49:50 +0000


Author: dburrows
Date: Sat Jul  2 18:49:47 2005
New Revision: 3568

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vs_progress.cc
Log:
Fix the progress bar for wide characters.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 18:49:47 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vs_progress.cc:
+
+	  Update the core progress bar for wide characters.
+
 	* src/ui.cc:
 
 	  Update ui.cc to use wide characters internally.

Modified: branches/aptitude-0.3/aptitude/src/vs_progress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vs_progress.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vs_progress.cc	Sat Jul  2 18:49:47 2005
@@ -23,6 +23,8 @@
 
 #include "vs_progress.h"
 
+#include <vscreen/transcode.h>
+
 void vs_progress::paint(const style &st)
 {
   int barsize;
@@ -38,9 +40,9 @@
 
       show_string_as_progbar(0,
 			     0,
-			     Op+percent_string,
-			     (st+get_style("Progress")).get_attrs(),
-			     st.get_attrs(),
+			     transcode(Op+percent_string),
+			     st+get_style("Progress"),
+			     st,
 			     barsize,
 			     width);
     }