Mercurial > boomslang
changeset 124:97322b78d1c1
Minor style cleanups
author | Neil Muller <neil@dip.sun.ac.za> |
---|---|
date | Tue, 24 Aug 2010 17:55:47 +0200 |
parents | 3b293e3b8829 |
children | d3ca34a664fd |
files | gamelib/cursor.py gamelib/gamescreen.py gamelib/hand.py gamelib/main.py gamelib/menu.py gamelib/popupmenu.py gamelib/state.py gamelib/widgets.py |
diffstat | 8 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/cursor.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/cursor.py Tue Aug 24 17:55:47 2010 +0200 @@ -9,6 +9,7 @@ import pygame.cursors import pygame.mouse + class CursorSprite(Sprite): "A Sprite that follows the Cursor" @@ -20,6 +21,7 @@ def update(self): self.rect.midtop = mouse.get_pos() + class CursorWidget(Widget): """Mix-in widget to ensure that mouse_move is propogated to parents"""
--- a/gamelib/gamescreen.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/gamescreen.py Tue Aug 24 17:55:47 2010 +0200 @@ -2,7 +2,7 @@ # Copyright Boomslang team, 2010 (see COPYING File) # Main menu for the game -from albow.controls import Button, Label, Widget +from albow.controls import Button, Widget from albow.layout import Row from albow.palette_view import PaletteView from albow.screen import Screen
--- a/gamelib/hand.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/hand.py Tue Aug 24 17:55:47 2010 +0200 @@ -8,6 +8,7 @@ from pygame.color import Color from pygame.rect import Rect + class HandButton(ImageButton): """The fancy hand button for the widget"""
--- a/gamelib/main.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/main.py Tue Aug 24 17:55:47 2010 +0200 @@ -29,6 +29,7 @@ opts, _ = parser.parse_args(args or []) return opts + class MainShell(Shell): def __init__(self, display): Shell.__init__(self, display)
--- a/gamelib/menu.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/menu.py Tue Aug 24 17:55:47 2010 +0200 @@ -6,6 +6,7 @@ from albow.controls import Button, Label from albow.layout import Column + class MenuScreen(Screen): def __init__(self, shell): Screen.__init__(self, shell)
--- a/gamelib/popupmenu.py Tue Aug 24 17:47:13 2010 +0200 +++ b/gamelib/popupmenu.py Tue Aug 24 17:55:47 2010 +0200 @@ -21,6 +21,7 @@ self.set_rect(Rect(0, 0, BUTTON_SIZE, BUTTON_SIZE)) self.margin = (BUTTON_SIZE - self.font.get_linesize()) / 2 + class PopupMenu(Menu, CursorWidget): def __init__(self, shell):