Mercurial > mamba

changeset 383:08a84134ccbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Box base class
author Neil Muller <drnlmuller@gmail.com>
date Sat, 17 Sep 2011 01:23:50 +0200
parents 9db8fbe8ae83
children 91655634a280
files mamba/widgets/editsprite.py mamba/widgets/entrybox.py mamba/widgets/listbox.py mamba/widgets/messagebox.py
diffstat 4 files changed, 13 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/mamba/widgets/editsprite.py	Sat Sep 17 01:23:41 2011 +0200
+++ b/mamba/widgets/editsprite.py	Sat Sep 17 01:23:50 2011 +0200
@@ -1,11 +1,8 @@
-import pygame
-from pygame.constants import SRCALPHA
-
-from mamba.widgets.base import Container
+from mamba.widgets.base import Box
 from mamba.widgets.text import TextWidget, TextButton, EntryTextWidget
 
 
-class EditSpriteBox(Container):
+class EditSpriteBox(Box):
     """Edit details for a special sprite on the level map"""
 
     def __init__(self, rect, sprite_pos, sprite, post_callback=None):
@@ -50,12 +47,7 @@
         cancel_button.add_callback('clicked', self.close, False)
         self.add(cancel_button)
         self.rect.width = max(self.rect.width, 400)
-
-    def draw(self, surface):
-        background = pygame.Surface(self.rect.size, SRCALPHA)
-        background.fill(pygame.Color('gray'))
-        surface.blit(background, self.rect)
-        super(EditSpriteBox, self).draw(surface)
+        self.rect.height += 5
 
     def close(self, ev, widget, do_update):
         if do_update:
--- a/mamba/widgets/entrybox.py	Sat Sep 17 01:23:41 2011 +0200
+++ b/mamba/widgets/entrybox.py	Sat Sep 17 01:23:50 2011 +0200
@@ -1,11 +1,10 @@
-import pygame
-from pygame.constants import SRCALPHA, K_ESCAPE, K_RETURN, KEYDOWN
+from pygame.constants import K_ESCAPE, K_RETURN, KEYDOWN
 
-from mamba.widgets.base import Container
+from mamba.widgets.base import Box
 from mamba.widgets.text import TextWidget, TextButton, EntryTextWidget
 
 
-class EntryBox(Container):
+class EntryBox(Box):
 
     def __init__(self, rect, text, init_value, accept_callback=None,
             color='white', entry_color='yellow'):
@@ -37,12 +36,7 @@
                 'Cancel')
         cancel_button.add_callback('clicked', self.close, False)
         self.add(cancel_button)
-
-    def draw(self, surface):
-        background = pygame.Surface(self.rect.size, SRCALPHA)
-        background.fill(pygame.Color('gray'))
-        surface.blit(background, self.rect)
-        super(EntryBox, self).draw(surface)
+        self.rect.height += 5
 
     def close(self, ev, widget, ok):
         if self.accept_callback and ok:
--- a/mamba/widgets/listbox.py	Sat Sep 17 01:23:41 2011 +0200
+++ b/mamba/widgets/listbox.py	Sat Sep 17 01:23:50 2011 +0200
@@ -1,12 +1,9 @@
-import pygame
-from pygame.constants import SRCALPHA
-
-from mamba.widgets.base import Container
+from mamba.widgets.base import Box
 from mamba.widgets.toollist import ToolListWidget
 from mamba.widgets.text import TextWidget, TextButton
 
 
-class ListBox(Container):
+class ListBox(Box):
 
     def __init__(self, rect, text, widget_list, page_length=8):
         super(ListBox, self).__init__(rect)
@@ -36,12 +33,7 @@
         ok_button.rect.topleft = ok_pos
         ok_button.add_callback('clicked', self.close)
         self.add(ok_button)
-
-    def draw(self, surface):
-        background = pygame.Surface(self.rect.size, SRCALPHA)
-        background.fill(pygame.Color('gray'))
-        surface.blit(background, self.rect)
-        super(ListBox, self).draw(surface)
+        self.rect.height += 5
 
     def close(self, ev, widget):
         if hasattr(self.parent, 'paused'):
--- a/mamba/widgets/messagebox.py	Sat Sep 17 01:23:41 2011 +0200
+++ b/mamba/widgets/messagebox.py	Sat Sep 17 01:23:50 2011 +0200
@@ -1,11 +1,8 @@
-import pygame
-from pygame.constants import SRCALPHA
-
-from mamba.widgets.base import Container
+from mamba.widgets.base import Box
 from mamba.widgets.text import TextWidget, TextButton
 
 
-class MessageBox(Container):
+class MessageBox(Box):
 
     def __init__(self, rect, text, post_callback=None, color='white'):
         super(MessageBox, self).__init__(rect)
@@ -37,12 +34,7 @@
         ok_button.rect.topleft = ok_pos
         ok_button.add_callback('clicked', self.close)
         self.add(ok_button)
-
-    def draw(self, surface):
-        background = pygame.Surface(self.rect.size, SRCALPHA)
-        background.fill(pygame.Color('gray'))
-        surface.blit(background, self.rect)
-        super(MessageBox, self).draw(surface)
+        self.rect.height += 5
 
     def close(self, ev, widget):
         if hasattr(self.parent, 'paused'):