gnue/common/src/cursing ComboBox.py Dialog.py V...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/16 10:20:21

Modified files:
        common/src/cursing: ComboBox.py Dialog.py VScrollBar.py 

Log message:
        Fixed incorrect drawing of Login dialog and scrollbars

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/ComboBox.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/Dialog.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/VScrollBar.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/common/src/cursing/ComboBox.py
diff -c gnue/common/src/cursing/ComboBox.py:1.5 
gnue/common/src/cursing/ComboBox.py:1.6
*** gnue/common/src/cursing/ComboBox.py:1.5     Thu Nov  7 11:37:03 2002
--- gnue/common/src/cursing/ComboBox.py Sat Nov 16 10:20:21 2002
***************
*** 62,68 ****
      W = self.W
      Screen.PrintAt(Y,X,chr(tiVLINE))
      Screen.PrintAt(Y,X+W-1,chr(tiVLINE))
!     Screen.PrintAt(Y+1,X, chr(tiLLC) + (W-2) * chr(tiHLINE) + chr(tiLRC))
      Screen.AutoRefresh = 1
  
    def _Show(self,v1,v2,v3):
--- 62,68 ----
      W = self.W
      Screen.PrintAt(Y,X,chr(tiVLINE))
      Screen.PrintAt(Y,X+W-1,chr(tiVLINE))
! #    Screen.PrintAt(Y+1,X, chr(tiLLC) + (W-2) * chr(tiHLINE) + chr(tiLRC))
      Screen.AutoRefresh = 1
  
    def _Show(self,v1,v2,v3):
Index: gnue/common/src/cursing/Dialog.py
diff -c gnue/common/src/cursing/Dialog.py:1.7 
gnue/common/src/cursing/Dialog.py:1.8
*** gnue/common/src/cursing/Dialog.py:1.7       Thu Nov  7 11:37:03 2002
--- gnue/common/src/cursing/Dialog.py   Sat Nov 16 10:20:21 2002
***************
*** 87,95 ****
        dialog box
      """
      cRow = TheControl.Y
!     cRow = cRow + self.R1 + self.BORDER
      cCol = TheControl.X
!     cCol = cCol + self.C1 + self.BORDER
      TheControl.Y = cRow
      TheControl.X = cCol
      ScreenContainer.AddControl(self,TheControl)
--- 87,95 ----
        dialog box
      """
      cRow = TheControl.Y
!     cRow = cRow + self.BORDER
      cCol = TheControl.X
!     cCol = cCol + self.BORDER
      TheControl.Y = cRow
      TheControl.X = cCol
      ScreenContainer.AddControl(self,TheControl)
Index: gnue/common/src/cursing/VScrollBar.py
diff -c gnue/common/src/cursing/VScrollBar.py:1.4 
gnue/common/src/cursing/VScrollBar.py:1.5
*** gnue/common/src/cursing/VScrollBar.py:1.4   Thu Oct 10 21:46:06 2002
--- gnue/common/src/cursing/VScrollBar.py       Sat Nov 16 10:20:21 2002
***************
*** 65,72 ****
    def Init(self, Max):
      self._max = Max
      self._val = 0
-     self.WorkingArea = float(self.H-9)
      self.start = self.Y+ 3
      self.UsedSpace = int(math.floor(self.WorkingArea / float(self._max)))
      self.stepsize = self.WorkingArea / self._max
      if self.UsedSpace < 1:
--- 65,72 ----
    def Init(self, Max):
      self._max = Max
      self._val = 0
      self.start = self.Y+ 3
+     self.WorkingArea = float(self.H-9)
      self.UsedSpace = int(math.floor(self.WorkingArea / float(self._max)))
      self.stepsize = self.WorkingArea / self._max
      if self.UsedSpace < 1:
***************
*** 74,107 ****
      self.Paint(None,None,None)
  
    def Paint(self,v1,v2,v3):
!     Pos = int(math.ceil(float(self._val) * (self.stepsize))) + self.start
      Screen = self.PARENT.Screen()
      Screen.AutoRefresh = 0
      # clear the bar region in reverse standard-color
      self.SetColor(sio.C_SCROLL_BACKGROUND)
  #    self.LoLight()
      for i in range(0, int(self.WorkingArea)):
!       Screen.PutAt( self.start + i,self.X, '?') #, curses.A_REVERSE)
      # correct position
      if Pos >= (self.WorkingArea + self.start):
        Pos = (self.start + self.WorkingArea)
      elif Pos < (self.start + self.UsedSpace):
        Pos = self.start + self.UsedSpace
!     # draw the handle in "menu"-hilight
      if self.FOCUS:
        self.SetColor(sio.C_SCROLL_SLIDER_FOCUS)
      else:
        self.SetColor(sio.C_SCROLL_SLIDER)
      #self.LoLight()
      for i in range(0, self.UsedSpace):
!       Screen.PutAt((Pos - self.UsedSpace) + i,self.X, 'x')#, curses.A_REVERSE)
      Screen.AutoRefresh = 1
      Screen.Refresh()
  
    def _ChangePos(self,arg1,newY,arg3):
      Screen = self.PARENT.Screen()
      Y = newY - self.start
!     Screen.PrintAt(0,0,'Y = ' + str(Y) + '  ' + str(self.WorkingArea))
      if Y >= (self.WorkingArea-1):
        val = self._max
      else:
--- 74,107 ----
      self.Paint(None,None,None)
  
    def Paint(self,v1,v2,v3):
!     Pos = int(math.ceil(float(self._val) * (self.stepsize))) + self._ABSY + 
self.start
      Screen = self.PARENT.Screen()
      Screen.AutoRefresh = 0
      # clear the bar region in reverse standard-color
      self.SetColor(sio.C_SCROLL_BACKGROUND)
  #    self.LoLight()
      for i in range(0, int(self.WorkingArea)):
!       Screen.PutAt( self.start + i,self._ABSX, '?') #, curses.A_REVERSE)
      # correct position
      if Pos >= (self.WorkingArea + self.start):
        Pos = (self.start + self.WorkingArea)
      elif Pos < (self.start + self.UsedSpace):
        Pos = self.start + self.UsedSpace
!     # draw the handle
      if self.FOCUS:
        self.SetColor(sio.C_SCROLL_SLIDER_FOCUS)
      else:
        self.SetColor(sio.C_SCROLL_SLIDER)
      #self.LoLight()
      for i in range(0, self.UsedSpace):
!       Screen.PutAt((self._ABSY + Pos - self.UsedSpace) + i,self._ABSX, 'x')#, 
curses.A_REVERSE)
      Screen.AutoRefresh = 1
      Screen.Refresh()
  
    def _ChangePos(self,arg1,newY,arg3):
      Screen = self.PARENT.Screen()
      Y = newY - self.start
! ##    Screen.PrintAt(0,0,'Y = ' + str(Y) + '  ' + str(self.WorkingArea))
      if Y >= (self.WorkingArea-1):
        val = self._max
      else: