Code cleanup

This commit is contained in:
9and3r
2014-08-04 11:33:40 +02:00
parent efd5201b65
commit cd8d9d1c17
10 changed files with 101 additions and 100 deletions

View File

@@ -1,6 +1,6 @@
import pygame
import logging
import math
import pygame
logger = logging.getLogger(__name__)
@@ -70,7 +70,8 @@ class TextItem(BaseItem):
self.box = self.font.render(text, True, self.color)
if size is not None:
if size[1] == -1:
BaseItem.__init__(self, pos, (size[0], self.font.size(text)[1]))
height = self.font.size(text)[1]
BaseItem.__init__(self, pos, (size[0], height))
else:
BaseItem.__init__(self, pos, size)
else:
@@ -180,8 +181,8 @@ class Progressbar(TouchObject):
self.text.set_text(str(self.value), True)
else:
self.text = TextItem(font, text, pos, None)
self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] / 2,
self.text.pos[1])
self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
2, self.text.pos[1])
def update(self):
pass
@@ -243,4 +244,4 @@ class ScrollBar(TouchObject):
def set_item(self, current_item):
self.current_item = current_item
self.bar_pos = float(self.current_item) / float(self.max) * float(
self.size[1])
self.size[1])