From: <Blu...@us...> - 2010-09-08 15:50:33
|
Revision: 395 http://virtplayground.svn.sourceforge.net/virtplayground/?rev=395&view=rev Author: BlueWolf_ Date: 2010-09-08 15:50:22 +0000 (Wed, 08 Sep 2010) Log Message: ----------- Moved and changed the size of the signup-window. Fixed some variables in gui.Button and gui.Link regarding appearance when clicked. When clicked, it didn't rendered its new state properly Modified Paths: -------------- trunk/client/gui.py trunk/client/playground.py Modified: trunk/client/gui.py =================================================================== --- trunk/client/gui.py 2010-09-07 20:38:29 UTC (rev 394) +++ trunk/client/gui.py 2010-09-08 15:50:22 UTC (rev 395) @@ -851,8 +851,8 @@ self.backgroundsurf = pygame.Surface((self.rect.width, \ self.rect.height*3), SRCALPHA).convert_alpha() self.style = None - self.mousedown = False - self.ispressed = False + self.clicked = False + self.clicked_visible = False self.caption = "" @@ -893,9 +893,9 @@ if self.style == "login": # Which state do we need? - if self.ispressed: + if self.clicked_visible: top = 68 - elif self.hover:# and not self.mousedown: + elif self.hover or self.clicked: top = 34 else: top = 0 @@ -923,31 +923,34 @@ def click(self, state, pos): if state == 0: - self.mousedown = True - self.ispressed = True + self.clicked = True + self.clicked_visible = True self.update() elif state == 1: - hover = bool(Rect(0, 0, self.rect.width, self.rect.height).collidepoint(pos)) - if hover != self.ispressed: - self.ispressed = hover + hover = bool(Rect(0, 0, self.rect.width, self.rect.height) + .collidepoint(pos)) + if hover != self.clicked_visible: + self.clicked_visible = hover self.update() elif state == 2: - self.mousedown = False + waspressed = self.clicked_visible + self.clicked = False + self.clicked_visible = False + self.update() - if self.ispressed: + if waspressed: self.submit() - - self.ispressed = False def submit(self): self.feedback.submit(self) def manualpush(self, state): - self.ispressed = state + self.clicked = state + self.clicked_visible = state self.update() @@ -1000,8 +1003,8 @@ def __defaults__(self): self.cangetfocus = False self.font = None - self.mousedown = False - self.ispressed = False + self.clicked = False + self.clicked_visible = False self.caption = "" self.color = [0, 0, 0] @@ -1038,10 +1041,10 @@ pos = self.rect.width - textwidth # Which state do we need? - if self.ispressed: + if self.clicked_visible: color = self.color_click self.font.set_underline(True) - elif self.hover and not self.mousedown: + elif self.hover or self.clicked: color = self.color_hover self.font.set_underline(True) else: @@ -1058,25 +1061,25 @@ def click(self, state, pos): if state == 0: - self.mousedown = True - self.ispressed = True + self.clicked = True + self.clicked_visible = True self.update() elif state == 1: hover = bool(Rect(0, 0, self.rect.width, self.rect.height).collidepoint(pos)) - if hover != self.ispressed: - self.ispressed = hover + if hover != self.clicked_visible: + self.clicked_visible = hover self.update() elif state == 2: - self.mousedown = False + wasclicked = self.clicked_visible + self.clicked = False + self.clicked_visible = False self.update() - if self.ispressed: + if wasclicked: self.submit() - - self.ispressed = False def submit(self): self.feedback.submit(self) Modified: trunk/client/playground.py =================================================================== --- trunk/client/playground.py 2010-09-07 20:38:29 UTC (rev 394) +++ trunk/client/playground.py 2010-09-08 15:50:22 UTC (rev 395) @@ -354,8 +354,10 @@ # Create signup window window = self.parent.logingui.add(gui.Window, "signup", \ - Rect(50, 50, 200, 200), SignupFeedback()) + Rect(300, 140, 400, 420), SignupFeedback()) window.caption = "Signup" + + #window.add(gui. window.unfreeze() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |