Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Text smooth scroll when it doesnt fit

Browse Source
This commit is contained in:
Ander
2014-11-14 01:45:23 +01:00
parent 3bb5c618c2
commit 08da4995f1
2 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mopidy_touchscreen/screen_objects.py
View File

@@ -220,8 +220,6 @@ class TextItem(BaseItem):
if size is not None: if size is not None:
if self.pos[0] + self.box.get_rect().width > pos[0] + size[0]: if self.pos[0] + self.box.get_rect().width > pos[0] + size[0]:
self.fit_horizontal = False self.fit_horizontal = False
self.text += " "
self.original_text = self.text
self.step = 0 self.step = 0
else: else:
self.fit_horizontal = True self.fit_horizontal = True
@@ -235,28 +233,17 @@ class TextItem(BaseItem):
def update(self): def update(self):
if not self.fit_horizontal: if not self.fit_horizontal:
if self.text == self.original_text: if self.step > self.box.get_rect().width:
if self.step > 90: self.step = -self.size[0]
self.step = 0
new_text = self.text[1:]
new_text = new_text + self.text[:1]
self.text = new_text
else: else:
self.step += 1 self.step = self.step + 4
elif self.step > 5:
self.step = 0
new_text = self.text[1:]
new_text = new_text + self.text[:1]
self.text = new_text
else:
self.step += 1
def render(self, surface): def render(self, surface):
if self.fit_horizontal: if self.fit_horizontal:
pass
else:
self.box = self.font.render(self.text, True, self.color)
surface.blit(self.box, self.pos, area=self.rect) surface.blit(self.box, self.pos, area=self.rect)
else:
surface.blit(self.box, self.pos, area=pygame.Rect(self.step, 0, self.size[0], self.size[1]))
def set_text(self, text, change_size): def set_text(self, text, change_size):
if change_size: if change_size:
@@ -299,14 +286,8 @@ class TouchAndTextItem(TouchObject, TextItem):
self.selected_box = self.font.render(text, True, self.selected_color) self.selected_box = self.font.render(text, True, self.selected_color)
def render(self, surface): def render(self, surface):
if self.fit_horizontal: if not self.fit_horizontal:
pass self.rect = pygame.Rect(self.step, 0, self.size[0], self.size[1])
else:
if self.active:
self.active_box = self.font.render(self.text, True,
self.active_color)
else:
self.box = self.font.render(self.text, True, self.color)
if self.selected: if self.selected:
surface.blit(self.selected_box, self.pos, area=self.rect) surface.blit(self.selected_box, self.pos, area=self.rect)
elif self.active: elif self.active:

2
mopidy_touchscreen/touch_screen.py
View File

@@ -44,7 +44,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
clock = pygame.time.Clock() clock = pygame.time.Clock()
if self.fullscreen: if self.fullscreen:
screen = pygame.display.set_mode(self.screen_size, screen = pygame.display.set_mode(self.screen_size,
pygame.FULLSCREEN) pygame.FULLSCREEN, pygame.HWSURFACE)
else: else:
screen = pygame.display.set_mode(self.screen_size) screen = pygame.display.set_mode(self.screen_size)
pygame.mouse.set_visible(self.cursor) pygame.mouse.set_visible(self.cursor)