# HG changeset patch # User Neil Muller # Date 1282561026 -7200 # Node ID 3d460c1274eed89da0b65a049d6a5ec6d31a7dee # Parent 7a977f8f433a8d5add232226cf577eb2f365c06b Add button size constant diff -r 7a977f8f433a -r 3d460c1274ee gamelib/constants.py --- a/gamelib/constants.py Mon Aug 23 12:46:51 2010 +0200 +++ b/gamelib/constants.py Mon Aug 23 12:57:06 2010 +0200 @@ -6,3 +6,5 @@ BITSIZE = -16 # unsigned 16 bit CHANNELS = 2 # 1 == mono, 2 == stereo BUFFER = 1024 # audio buffer size in no. of samples + +BUTTON_SIZE = 50 diff -r 7a977f8f433a -r 3d460c1274ee gamelib/gamescreen.py --- a/gamelib/gamescreen.py Mon Aug 23 12:46:51 2010 +0200 +++ b/gamelib/gamescreen.py Mon Aug 23 12:57:06 2010 +0200 @@ -4,6 +4,7 @@ from state import initial_state, Item from hand import HandButton +from constants import BUTTON_SIZE from pygame.color import Color from pygame import Rect @@ -21,7 +22,7 @@ sel_width = 2 def __init__(self, state, handbutton): - PaletteView.__init__(self, (50, 50), 1, 6, scrolling=True) + PaletteView.__init__(self, (BUTTON_SIZE, BUTTON_SIZE), 1, 6, scrolling=True) self.state = state self.selection = None self.handbutton = handbutton @@ -47,7 +48,7 @@ class StateWidget(Widget): def __init__(self, state): - Widget.__init__(self, Rect(0, 0, 800, 550)) + Widget.__init__(self, Rect(0, 0, 800, 600 - BUTTON_SIZE)) self.state = state def draw(self, surface): @@ -79,18 +80,18 @@ self.add_centered(menu) self.menubutton = Button('Menu', action=self.main_menu) self.menubutton.font = get_font(16, 'Vera.ttf') - self.menubutton.set_rect(Rect(0, 0, 50, 50)) + self.menubutton.set_rect(Rect(0, 0, BUTTON_SIZE, BUTTON_SIZE)) self.menubutton.bottomleft = self.bottomleft - self.menubutton.margin = (50 - self.menubutton.font.get_linesize()) / 2 + self.menubutton.margin = (BUTTON_SIZE - self.menubutton.font.get_linesize()) / 2 self.add(self.menubutton) self.handbutton = HandButton(action=self.hand_pressed) self.handbutton.bottomleft = self.bottomleft - self.handbutton.get_rect().move_ip(50, 0) + self.handbutton.get_rect().move_ip(BUTTON_SIZE, 0) self.add(self.handbutton) self.inventory = InventoryView(self.state, self.handbutton) self.inventory.bottomleft = self.bottomleft - self.inventory.get_rect().move_ip(100, 0) + self.inventory.get_rect().move_ip(2 * BUTTON_SIZE, 0) self.add(self.inventory) # Test items