mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Animation
This commit is contained in:
@@ -80,15 +80,19 @@ class ListView():
|
||||
else:
|
||||
return False
|
||||
|
||||
def render(self, surface, update_all, rects):
|
||||
def set_update_rects(self, rects):
|
||||
for key in self.update_keys:
|
||||
object = self.screen_objects.get_touch_object(key)
|
||||
object.update()
|
||||
rects.append(object.rect_in_pos)
|
||||
|
||||
def render(self, surface, update_all):
|
||||
if update_all:
|
||||
self.screen_objects.render(surface)
|
||||
else:
|
||||
for key in self.update_keys:
|
||||
object = self.screen_objects.get_touch_object(key)
|
||||
object.update()
|
||||
object.render(surface)
|
||||
rects.append(object.rect_in_pos)
|
||||
|
||||
def touch_event(self, touch_event):
|
||||
self.must_update = True
|
||||
|
||||
@@ -21,6 +21,22 @@ class ScreenObjectsManager:
|
||||
def set_object(self, key, add_object):
|
||||
self.text_objects[key] = add_object
|
||||
|
||||
def get_update_rects(self):
|
||||
update_rects = []
|
||||
for key in self.text_objects:
|
||||
object = self.text_objects[key]
|
||||
if hasattr(object, "fit_horizontal") and not object.fit_horizontal:
|
||||
update_rects.append(object.rect_in_pos)
|
||||
for key in self.touch_objects:
|
||||
object = self.touch_objects[key]
|
||||
if hasattr(object, "fit_horizontal") and not object.fit_horizontal:
|
||||
update_rects.append(object.rect_in_pos)
|
||||
return update_rects
|
||||
|
||||
def set_horizontal_shift(self, shift):
|
||||
for key in self.text_objects:
|
||||
self.text_objects[key].set_horizontal_shift(shift)
|
||||
|
||||
def get_object(self, key):
|
||||
return self.text_objects[key]
|
||||
|
||||
@@ -72,10 +88,11 @@ class ScreenObjectsManager:
|
||||
self.selected_key = None
|
||||
|
||||
|
||||
class BaseItem():
|
||||
def __init__(self, pos, size):
|
||||
class BaseItem:
|
||||
def __init__(self, pos, size, horizontal_shift=0):
|
||||
self.pos = pos
|
||||
self.size = size
|
||||
self.horizontal_shift = horizontal_shift
|
||||
self.rect = pygame.Rect(0, 0, self.size[0], self.size[1])
|
||||
self.rect_in_pos = pygame.Rect(self.pos[0], self.pos[1],
|
||||
self.size[0],
|
||||
@@ -84,16 +101,31 @@ class BaseItem():
|
||||
def get_right_pos(self):
|
||||
return self.pos[0] + self.size[0]
|
||||
|
||||
def set_horizontal_shift(self, shift):
|
||||
self.horizontal_shift = shift
|
||||
|
||||
def update(self):
|
||||
return False
|
||||
|
||||
|
||||
class ImageView(BaseItem):
|
||||
def __init__(self, pos, size, horizontal_shift=0):
|
||||
BaseItem.__init__(self, pos, size, horizontal_shift)
|
||||
self.image = None
|
||||
|
||||
def set_image(self, image):
|
||||
self.image = image
|
||||
|
||||
def render(self, surface):
|
||||
if self.image is not None:
|
||||
surface.blit(self.image, (self.pos[0] + self.horizontal_shift, self.pos[1]))
|
||||
|
||||
class TextItem(BaseItem):
|
||||
|
||||
scroll_speed = 2
|
||||
|
||||
def __init__(self, font, text, pos, size, center=False, background=None,
|
||||
scroll_no_fit=True):
|
||||
scroll_no_fit=True, horizontal_shift=0):
|
||||
self.font = font
|
||||
self.text = text
|
||||
self.scroll_no_fit = scroll_no_fit
|
||||
@@ -104,11 +136,11 @@ class TextItem(BaseItem):
|
||||
if size is not None:
|
||||
if size[1] == -1:
|
||||
height = self.font.size(text)[1]
|
||||
BaseItem.__init__(self, pos, (size[0], height))
|
||||
BaseItem.__init__(self, pos, (size[0], height), horizontal_shift)
|
||||
else:
|
||||
BaseItem.__init__(self, pos, size)
|
||||
BaseItem.__init__(self, pos, size, horizontal_shift)
|
||||
else:
|
||||
BaseItem.__init__(self, pos, self.font.size(text))
|
||||
BaseItem.__init__(self, pos, self.font.size(text), horizontal_shift)
|
||||
if size is not None:
|
||||
if self.pos[0] + self.box.get_rect().width > pos[0] + \
|
||||
size[0]:
|
||||
@@ -155,25 +187,26 @@ class TextItem(BaseItem):
|
||||
if self.background:
|
||||
surface.fill(self.background, rect=self.rect_in_pos)
|
||||
pygame.draw.rect(surface, (0, 0, 0), self.rect_in_pos, 1)
|
||||
pos = (self.pos[0] + self.horizontal_shift, self.pos[1])
|
||||
if self.fit_horizontal:
|
||||
surface.blit(
|
||||
self.box, ((self.pos[0] + self.margin),
|
||||
self.box, ((pos[0] + self.margin),
|
||||
self.pos[1]), area=self.rect)
|
||||
else:
|
||||
if self.scroll_no_fit:
|
||||
surface.blit(self.box, self.pos,
|
||||
surface.blit(self.box, pos,
|
||||
area=pygame.Rect(self.step, 0, self.size[0],
|
||||
self.size[1]))
|
||||
if self.step_2 is not None:
|
||||
surface.blit(self.box, (self.pos[0]+self.step_2,
|
||||
self.pos[1]),
|
||||
surface.blit(self.box, (pos[0]+self.step_2,
|
||||
pos[1]),
|
||||
area=pygame.Rect(0, 0,
|
||||
self.size[0] -
|
||||
self.step_2,
|
||||
self.size[1]))
|
||||
else:
|
||||
step = self.box.get_rect().width - self.size[0]
|
||||
surface.blit(self.box, self.pos,
|
||||
surface.blit(self.box, pos,
|
||||
area=pygame.Rect(step, 0, self.size[0],
|
||||
self.size[1]))
|
||||
|
||||
@@ -182,11 +215,11 @@ class TextItem(BaseItem):
|
||||
if change_size:
|
||||
TextItem.__init__(self, self.font, text, self.pos,
|
||||
None, self.center, self.background,
|
||||
self.scroll_no_fit)
|
||||
self.scroll_no_fit, self.horizontal_shift)
|
||||
else:
|
||||
TextItem.__init__(self, self.font, text, self.pos,
|
||||
self.size, self.center, self.background,
|
||||
self.scroll_no_fit)
|
||||
self.scroll_no_fit, self.horizontal_shift)
|
||||
|
||||
def add_text(self, add_text, change_size):
|
||||
self.set_text(self.text+add_text, change_size)
|
||||
|
||||
84
mopidy_touchscreen/graphic_utils/view_pager.py
Normal file
84
mopidy_touchscreen/graphic_utils/view_pager.py
Normal file
@@ -0,0 +1,84 @@
|
||||
__author__ = 'ander'
|
||||
|
||||
from ..screens.base_screen import BaseScreen
|
||||
import traceback
|
||||
|
||||
|
||||
class ViewPager:
|
||||
|
||||
def __init__(self, size, manager):
|
||||
self.size = size
|
||||
self.objets_manager = [manager.create_objects_manager(), manager.create_objects_manager(), manager.create_objects_manager()]
|
||||
self.pos = 0
|
||||
self.manager = manager
|
||||
self.next = False
|
||||
self.direction = 0
|
||||
self.previous = False
|
||||
self.speed = self.size[0] / 15
|
||||
self.update = False
|
||||
self.update_rects = []
|
||||
|
||||
def notify_changed(self):
|
||||
try:
|
||||
for i in range(0, 3, 1):
|
||||
self.manager.set_page_values(self.objets_manager[i], i)
|
||||
self.update = True
|
||||
except:
|
||||
traceback.print_exc()
|
||||
|
||||
def change_to_page(self, page):
|
||||
self.direction = page
|
||||
self.update = True
|
||||
|
||||
def should_update(self):
|
||||
if self.update:
|
||||
return BaseScreen.update_all
|
||||
else:
|
||||
if len(self.update_rects)>0:
|
||||
return BaseScreen.update_partial
|
||||
else:
|
||||
return BaseScreen.no_update
|
||||
|
||||
def shift(self):
|
||||
if self.direction == 1:
|
||||
if -self.pos > self.size[0]:
|
||||
self.pos = 0
|
||||
self.direction = 0
|
||||
aux = self.objets_manager[0]
|
||||
self.objets_manager[0] = self.objets_manager[1]
|
||||
self.objets_manager[1] = self.objets_manager[2]
|
||||
self.objets_manager[2] = aux
|
||||
self.notify_changed()
|
||||
else:
|
||||
self.pos -= self.speed
|
||||
self.objets_manager[2].set_horizontal_shift(self.size[0] + self.pos)
|
||||
self.objets_manager[1].set_horizontal_shift(self.pos)
|
||||
elif self.direction == -1:
|
||||
if self.pos > self.size[0]:
|
||||
self.pos = 0
|
||||
self.direction = 0
|
||||
aux = self.objets_manager[2]
|
||||
self.objets_manager[2] = self.objets_manager[1]
|
||||
self.objets_manager[1] = self.objets_manager[0]
|
||||
self.objets_manager[0] = aux
|
||||
self.notify_changed()
|
||||
else:
|
||||
self.pos += self.speed
|
||||
self.objets_manager[0].set_horizontal_shift(-self.size[0] + self.pos)
|
||||
self.objets_manager[1].set_horizontal_shift(self.pos)
|
||||
|
||||
def render(self, screen, update_type):
|
||||
if self.direction != 0:
|
||||
self.shift()
|
||||
if self.pos != 0:
|
||||
if self.direction == 1:
|
||||
self.objets_manager[2].render(screen)
|
||||
elif self.direction == -1:
|
||||
self.objets_manager[0].render(screen)
|
||||
else:
|
||||
self.update = False
|
||||
self.update_rects = self.objets_manager[1].get_update_rects()
|
||||
#if update_type == BaseScreen.update_partial:
|
||||
#rects += self.update_rects
|
||||
|
||||
self.objets_manager[1].render(screen)
|
||||
Reference in New Issue
Block a user