|
@@ -326,11 +326,13 @@ class Progressbar(TouchObject):
|
|
|
self.surface.fill(self.back_color)
|
|
self.surface.fill(self.back_color)
|
|
|
self.value_text = value_text
|
|
self.value_text = value_text
|
|
|
if value_text:
|
|
if value_text:
|
|
|
- self.text = TextItem(font, str(self.max), pos, None)
|
|
|
|
|
|
|
+ self.text = TextItem(font, str(max_value), pos, None)
|
|
|
|
|
+ self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
|
|
|
|
|
+ 2, self.text.pos[1])
|
|
|
self.text.set_text(str(self.value), True)
|
|
self.text.set_text(str(self.value), True)
|
|
|
else:
|
|
else:
|
|
|
self.text = TextItem(font, text, pos, None)
|
|
self.text = TextItem(font, text, pos, None)
|
|
|
- self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
|
|
|
|
|
|
|
+ self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
|
|
|
2, self.text.pos[1])
|
|
2, self.text.pos[1])
|
|
|
|
|
|
|
|
def update(self):
|
|
def update(self):
|
|
@@ -345,6 +347,8 @@ class Progressbar(TouchObject):
|
|
|
self.value = value
|
|
self.value = value
|
|
|
if self.value_text:
|
|
if self.value_text:
|
|
|
self.set_text(str(self.value))
|
|
self.set_text(str(self.value))
|
|
|
|
|
+ self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
|
|
|
|
|
+ 2, self.text.pos[1])
|
|
|
self.surface.fill(self.back_color)
|
|
self.surface.fill(self.back_color)
|
|
|
pos_pixel = value * self.size[0] / self.max
|
|
pos_pixel = value * self.size[0] / self.max
|
|
|
rect = pygame.Rect(0, 0, pos_pixel, self.size[1])
|
|
rect = pygame.Rect(0, 0, pos_pixel, self.size[1])
|