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

Fix Main Screen

Browse Source
This commit is contained in:
9and3r
2015-05-23 15:30:01 +02:00
parent eefc6c40ef
commit fd25b7cf86
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy_touchscreen/graphic_utils/background_manager.py
View File

@@ -41,11 +41,10 @@ class DynamicBackground:
self.update = True self.update = True
@staticmethod def get_aspect_scale_size(img, new_size):
def get_aspect_scale_size(img, size):
size = img.get_size() size = img.get_size()
aspect_x = size[0] / float(size[0]) aspect_x = new_size[0] / float(size[0])
aspect_y = size[1] / float(size[1]) aspect_y = new_size[1] / float(size[1])
if aspect_x > aspect_y: if aspect_x > aspect_y:
aspect = aspect_x aspect = aspect_x
else: else:

16
mopidy_touchscreen/screens/main_screen.py
View File

@@ -137,7 +137,7 @@ class MainScreen(BaseScreen):
def track_started(self, track): def track_started(self, track):
self.update_keys = [] self.update_keys = []
self.image = None self.image = None
x = self.base_size * 5 x = self.size[1] - self.base_size * 3
width = self.size[0] - self.base_size / 2 - x width = self.size[0] - self.base_size / 2 - x
self.track_duration = time.strftime('%M:%S', time.gmtime( self.track_duration = time.strftime('%M:%S', time.gmtime(
@@ -151,7 +151,7 @@ class MainScreen(BaseScreen):
# Track name # Track name
label = TextItem(self.fonts['base'], label = TextItem(self.fonts['base'],
MainScreen.get_track_name(track), MainScreen.get_track_name(track),
(x, self.base_size * 2), (width, -1)) (x, (self.size[1]-self.base_size*3)/2 - self.base_size*0.5), (width, -1))
if not label.fit_horizontal: if not label.fit_horizontal:
self.update_keys.append("track_name") self.update_keys.append("track_name")
self.touch_text_manager.set_object("track_name", label) self.touch_text_manager.set_object("track_name", label)
@@ -159,7 +159,7 @@ class MainScreen(BaseScreen):
# Album name # Album name
label = TextItem(self.fonts['base'], label = TextItem(self.fonts['base'],
MainScreen.get_track_album_name MainScreen.get_track_album_name
(track), (x, self.base_size * 3), (track), (x, (self.size[1]-self.base_size*3)/2 + self.base_size*0.5),
(width, -1)) (width, -1))
if not label.fit_horizontal: if not label.fit_horizontal:
self.update_keys.append("album_name") self.update_keys.append("album_name")
@@ -168,7 +168,7 @@ class MainScreen(BaseScreen):
# Artist # Artist
label = TextItem(self.fonts['base'], label = TextItem(self.fonts['base'],
self.get_artist_string(), self.get_artist_string(),
(x, self.base_size * 4), (x, (self.size[1]-self.base_size*3)/2 + self.base_size*1.5),
(width, -1)) (width, -1))
if not label.fit_horizontal: if not label.fit_horizontal:
self.update_keys.append("artist_name") self.update_keys.append("artist_name")
@@ -176,14 +176,14 @@ class MainScreen(BaseScreen):
# Previous track button # Previous track button
button = TouchAndTextItem(self.fonts['icon'], u"\ue61c", button = TouchAndTextItem(self.fonts['icon'], u"\ue61c",
(0, self.base_size * 6), None) (0, self.size[1] - self.base_size * 2), None)
self.touch_text_manager.set_touch_object("previous", button) self.touch_text_manager.set_touch_object("previous", button)
size_1 = button.get_right_pos() size_1 = button.get_right_pos()
size_2 = self.fonts['icon'].size(u"\ue61d")[0] size_2 = self.fonts['icon'].size(u"\ue61d")[0]
button = TouchAndTextItem(self.fonts['icon'], u"\ue61d", button = TouchAndTextItem(self.fonts['icon'], u"\ue61d",
(self.size[0] - size_2, (self.size[0] - size_2,
self.base_size * 6), self.size[1] - self.base_size * 2),
None) None)
self.touch_text_manager.set_touch_object("next", button) self.touch_text_manager.set_touch_object("next", button)
@@ -192,7 +192,7 @@ class MainScreen(BaseScreen):
time.strftime('%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
0)) + "/" + time.strftime( 0)) + "/" + time.strftime(
'%M:%S', time.gmtime(0)), '%M:%S', time.gmtime(0)),
(size_1, self.base_size * 6), (size_1, self.size[1] - self.base_size * 2),
( (
self.size[0] - size_1 - size_2, self.size[0] - size_1 - size_2,
self.base_size), self.base_size),
@@ -332,7 +332,7 @@ class MainScreen(BaseScreen):
self.touch_text_manager.set_object("artist_name", current) self.touch_text_manager.set_object("artist_name", current)
def load_image(self): def load_image(self):
size = self.base_size * 4 size = self.size[1] - self.base_size * 4
image_original = pygame.image.load( image_original = pygame.image.load(
self.get_cover_folder() + self.get_cover_folder() +
self.get_image_file_name()) self.get_image_file_name())