Thread: [Ocemp-CVS] ocempgui/ocempgui/widgets Button.py, 1.42, 1.43 ImageButton.py, 1.34, 1.35 Renderer.py,
Status: Beta
Brought to you by:
marcusva
From: Marcus v. A. <mar...@us...> - 2006-11-14 12:45:42
|
Update of /cvsroot/ocemp/ocempgui/ocempgui/widgets In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4956/ocempgui/widgets Modified Files: Button.py ImageButton.py Renderer.py ToggleButton.py Log Message: Fixed state setting issue in Button, ToggleButton and ImageButton classes, which forced them to be redrawn again and again. Index: ToggleButton.py =================================================================== RCS file: /cvsroot/ocemp/ocempgui/ocempgui/widgets/ToggleButton.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ToggleButton.py 14 Sep 2006 23:27:57 -0000 1.31 +++ ToggleButton.py 14 Nov 2006 12:45:37 -0000 1.32 @@ -151,8 +151,9 @@ Sets the state of the ToggleButton and causes its child to set its state to the same value. """ - if self.active and (state != STATE_ACTIVE): + if (self.active and (state != STATE_ACTIVE)) or (self.state == state): return + self.lock () if self.child: self.child.state = state Index: ImageButton.py =================================================================== RCS file: /cvsroot/ocemp/ocempgui/ocempgui/widgets/ImageButton.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ImageButton.py 16 Aug 2006 09:29:39 -0000 1.34 +++ ImageButton.py 14 Nov 2006 12:45:37 -0000 1.35 @@ -175,6 +175,9 @@ Sets the state of the ImageButton and causes its child to set its state to the same value. """ + if self.state == state: + return + self.lock () if self.child: self.child.state = state Index: Button.py =================================================================== RCS file: /cvsroot/ocemp/ocempgui/ocempgui/widgets/Button.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- Button.py 2 Jul 2006 13:08:53 -0000 1.42 +++ Button.py 14 Nov 2006 12:45:37 -0000 1.43 @@ -139,6 +139,9 @@ Sets the state of the Button and causes its child to set its state to the same value. """ + if self.state == state: + return + self.lock () if self.child: self.child.state = state Index: Renderer.py =================================================================== RCS file: /cvsroot/ocemp/ocempgui/ocempgui/widgets/Renderer.py,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- Renderer.py 14 Nov 2006 11:42:02 -0000 1.76 +++ Renderer.py 14 Nov 2006 12:45:37 -0000 1.77 @@ -644,7 +644,7 @@ blit (self._background, widget.rect, widget.rect) rects.append (widget.rect) - widget.manager = None + widget.manager = None self.remove_index (*widgets) # Clean up. |