Forráskód Böngészése

dselect: Move gap_width from derived classes to baselist

Guillem Jover 14 éve
szülő
commit
c594b0dc8a
6 módosított fájl, 5 hozzáadás és 5 törlés
  1. 2 0
      dselect/baselist.cc
  2. 1 0
      dselect/dselect.h
  3. 0 1
      dselect/methlist.cc
  4. 1 1
      dselect/method.h
  5. 0 2
      dselect/pkgdisplay.cc
  6. 1 1
      dselect/pkglist.h

+ 2 - 0
dselect/baselist.cc

@@ -242,6 +242,8 @@ baselist::baselist(keybindings *kb) {
   bindings= kb;
   nitems= 0;
 
+  gap_width = 1;
+
   xmax= -1;
   list_height=0; info_height=0;
   topofscreen= 0; leftofscreen= 0;

+ 1 - 0
dselect/dselect.h

@@ -58,6 +58,7 @@ protected:
   int selstate_attr, selstatesel_attr;
   int helpscreen_attr;
 
+  int gap_width;
   int total_width;
 
   // (n)curses stuff

+ 0 - 1
dselect/methlist.cc

@@ -60,7 +60,6 @@ void methodlist::setwidths() {
   debug(dbg_general, "methodlist[%p]::setwidths()", this);
 
   status_width= 1;
-  gap_width= 1;
   name_width= 14;
   name_column= status_width + gap_width;
   description_column= name_column + name_width + gap_width;

+ 1 - 1
dselect/method.h

@@ -51,7 +51,7 @@ struct dselect_option {
 
 class methodlist : public baselist {
 protected:
-  int status_width, gap_width, name_width, description_width;
+  int status_width, name_width, description_width;
   int name_column, description_column;
 
   // Table of methods

+ 0 - 2
dselect/pkgdisplay.cc

@@ -146,8 +146,6 @@ void packagelist::setwidths() {
   }
   section_width= 8;
 
-  gap_width= 1;
-
   if (sortorder == so_section) {
     section_column= status_width + gap_width;
     priority_column= section_column + section_width + gap_width;

+ 1 - 1
dselect/pkglist.h

@@ -86,7 +86,7 @@ struct perpackagestate {
 
 class packagelist : public baselist {
 protected:
-  int status_width, gap_width, section_width, priority_width;
+  int status_width, section_width, priority_width;
   int package_width, versioninstalled_width, versionavailable_width, description_width;
   int section_column, priority_column, versioninstalled_column;
   int versionavailable_column, package_column, description_column;