Mercurial > sypikslang

changeset 196:eb4516169b3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak inventory window layout
author Neil Muller <drnlmuller@gmail.com>
date Sat, 12 May 2012 17:06:12 +0200
parents 75989ca906cd
children 108806a1d6f9
files gamelib/gamegui.py
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/gamegui.py	Sat May 12 16:50:20 2012 +0200
+++ b/gamelib/gamegui.py	Sat May 12 17:06:12 2012 +0200
@@ -243,8 +243,8 @@
         self.equip = equip
         self.parent = parent
         self.available = available
-        super(EquipWidget, self).__init__(pos, '[%s : %d] - %d (x %d)'
-                % (equip.NAME, equip.points, equip.COST, copies), font_small)
+        super(EquipWidget, self).__init__(pos, '[%s : %d] - %d'
+                % (equip.NAME, equip.points, equip.COST), font_small)
         if not self.available:
             unavailable = ImageDrawable((0, 0, self.WIDTH, self.HEIGHT),
                     self.BG_IMAGE_UNAVAILABLE)
@@ -333,8 +333,11 @@
         for equip in equipment:
             count = self.parent.equipment.count(equip)
             widget = TextLabel((x, y, 700, 15), '%s  x %s'
-                    % (equip.NAME, count), font_small, (255, 255, 255))
-            y += 15
+                    % (equip.NAME, count), font_medium, (255, 255, 128))
+            x += 270
+            if x > WIDTH:
+                x = 10
+                y += 18
             self._inventory.append(widget)
             self.add_child(widget)
 
@@ -344,7 +347,7 @@
         self._equip = []
         x = 0
         y = max(250, 130 + self.description.rect.height +
-                20 * len(self._inventory))
+                20 * len(self._inventory) // 3)
         available = self.game.get_available_equipment()
         for equip in self.game.get_all_equipment():
             copies = self.parent.equipment.count(equip)