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

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 03:06:26 2005
New Revision: 3128

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc
Log:
Fix some attribute problems with the new label stuff.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 03:06:26 2005
@@ -1,5 +1,10 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/testvscreen.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
+
+	  Add a attribute-less set_text; fix various places where it needs
+	  to be used.
+
 	* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
 
 	  Make labels use fragments internally.  IMPORTANT: this means

Modified: branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	Wed Apr 27 03:06:26 2005
@@ -56,7 +56,11 @@
 
   bool focus_me() {return true;}
 
-  bool handle_char(chtype ch) {set_text(keyname(ch)); return true;}
+  bool handle_char(chtype ch)
+  {
+    set_text(keyname(ch));
+    return true;
+  }
 };
 
 class silly_block:public vscreen_widget
@@ -304,7 +308,8 @@
   if(item)
     {
       label->show();
-      label->set_text(item->get_description());
+      label->set_text(item->get_description(),
+		      get_color("ScreenStatusColor"));
     }
   else
     label->hide();

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc	Wed Apr 27 03:06:26 2005
@@ -16,13 +16,13 @@
   txt=new fragment_cache(f);
 }
 
-vs_label::vs_label(string _txt, int _attr)
+vs_label::vs_label(const string &_txt, int _attr)
   :txt(new fragment_cache(text_fragment(_txt, _attr)))
 {
   set_bg(_attr);
 }
 
-vs_label::vs_label(string _txt)
+vs_label::vs_label(const string &_txt)
   :txt(new fragment_cache(text_fragment(_txt)))
 {
 }
@@ -42,13 +42,20 @@
   return point(0,0);
 }
 
-void vs_label::set_text(string _txt, int attr)
+void vs_label::set_text(const string &_txt, int attr)
 {
   txt=new fragment_cache(text_fragment(_txt, attr));
   // Our size might have changed, so re-layout the screen.
   vscreen_queuelayout();
 }
 
+void vs_label::set_text(const string &_txt)
+{
+  txt=new fragment_cache(text_fragment(_txt));
+  // Our size might have changed, so re-layout the screen.
+  vscreen_queuelayout();
+}
+
 void vs_label::paint()
 {
   fragment_contents lines=txt->layout(getmaxx(), getmaxx());

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h	Wed Apr 27 03:06:26 2005
@@ -13,8 +13,8 @@
   fragment_cache *txt;
 public:
   vs_label(fragment *f);
-  vs_label(std::string _txt, int attr);
-  vs_label(std::string _txt);
+  vs_label(const std::string &_txt, int attr);
+  vs_label(const std::string &_txt);
   ~vs_label();
 
   bool get_cursorvisible();
@@ -27,7 +27,8 @@
   int height_request(int width);
 
   void paint();
-  void set_text(std::string _txt, int attr);
+  void set_text(const std::string &_txt, int attr);
+  void set_text(const std::string &_txt);
   void set_text(fragment *f);
 };
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc	Wed Apr 27 03:06:26 2005
@@ -1,6 +1,6 @@
 // vs_minibuf_win.cc
 //
-//  Copyright 2000 Daniel Burrows
+//  Copyright 2000-2005 Daniel Burrows
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -121,12 +121,12 @@
 
 void vs_minibuf_win::set_header(string new_header)
 {
-  header->set_text(new_header);
+  header->set_text(new_header, get_color("ScreenHeaderColor"));
 }
 
 void vs_minibuf_win::set_status(string new_status)
 {
-  status_lbl->set_text(new_status);
+  status_lbl->set_text(new_status, get_color("ScreenStatusColor"));
 }
 
 void vs_minibuf_win::add_widget(vscreen_widget *widget)