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

Removed magic numbers and replaced them with just resolution_factor. Set resolution_factor to 8 in ext.conf

Browse Source
This commit is contained in:
frank
2015-05-22 22:37:41 -04:00
parent 3a503ed48a
commit 9a7c5afa4f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy_touchscreen/ext.conf
View File

@@ -2,7 +2,7 @@
enabled = true enabled = true
screen_width = 320 screen_width = 320
screen_height = 240 screen_height = 240
resolution_factor = 0 resolution_factor = 8
cursor = True cursor = True
fullscreen = False fullscreen = False
cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen

20
mopidy_touchscreen/screen_manager.py
View File

@@ -49,7 +49,7 @@ class ScreenManager():
self.size = size self.size = size
self.resolution_factor = resolution_factor self.resolution_factor = resolution_factor
self.background = DynamicBackground(self.size) self.background = DynamicBackground(self.size)
self.base_size = self.size[1] / (8+self.resolution_factor) #change this for more screen space self.base_size = self.size[1] / self.resolution_factor
font = resource_filename( font = resource_filename(
Requirement.parse("mopidy-touchscreen"), Requirement.parse("mopidy-touchscreen"),
"mopidy_touchscreen/icomoon.ttf") "mopidy_touchscreen/icomoon.ttf")
@@ -76,35 +76,35 @@ class ScreenManager():
# Search button # Search button
button = TouchAndTextItem(self.fonts['icon'], u" \ue986", button = TouchAndTextItem(self.fonts['icon'], u" \ue986",
(0, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (0, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, center=True) button_size, center=True)
self.down_bar_objects.set_touch_object("menu_0", button) self.down_bar_objects.set_touch_object("menu_0", button)
x = button.get_right_pos() x = button.get_right_pos()
# Main button # Main button
button = TouchAndTextItem(self.fonts['icon'], u" \ue600", button = TouchAndTextItem(self.fonts['icon'], u" \ue600",
(x, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (x, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, center=True) button_size, center=True)
self.down_bar_objects.set_touch_object("menu_1", button) self.down_bar_objects.set_touch_object("menu_1", button)
x = button.get_right_pos() x = button.get_right_pos()
# Tracklist button # Tracklist button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60d", button = TouchAndTextItem(self.fonts['icon'], u" \ue60d",
(x, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (x, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, center=True) button_size, center=True)
self.down_bar_objects.set_touch_object("menu_2", button) self.down_bar_objects.set_touch_object("menu_2", button)
x = button.get_right_pos() x = button.get_right_pos()
# Library button # Library button
button = TouchAndTextItem(self.fonts['icon'], u" \ue604", button = TouchAndTextItem(self.fonts['icon'], u" \ue604",
(x, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (x, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, center=True) button_size, center=True)
self.down_bar_objects.set_touch_object("menu_3", button) self.down_bar_objects.set_touch_object("menu_3", button)
x = button.get_right_pos() x = button.get_right_pos()
# Playlist button # Playlist button
button = TouchAndTextItem(self.fonts['icon'], u" \ue605", button = TouchAndTextItem(self.fonts['icon'], u" \ue605",
(x, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (x, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, center=True) button_size, center=True)
self.down_bar_objects.set_touch_object("menu_4", button) self.down_bar_objects.set_touch_object("menu_4", button)
@@ -112,18 +112,18 @@ class ScreenManager():
# Menu button # Menu button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
(x, self.base_size * (7+self.resolution_factor)), #change these to move the location of the icons (x, self.size[1] - self.base_size), #change these to move the location of the icons
button_size, button_size,
center=True) center=True)
self.down_bar_objects.set_touch_object("menu_5", button) self.down_bar_objects.set_touch_object("menu_5", button)
# Down bar Solid # Down bar Solid
self.down_bar_solid = pygame.Surface( self.down_bar_solid = pygame.Surface(
(self.size[0], self.size[1] - self.base_size * (7+self.resolution_factor))) #change the 7 to move the bar (self.size[0], self.size[1] - self.base_size )) #change the 7 to move the bar
# Down bar # Down bar
self.down_bar = pygame.Surface( self.down_bar = pygame.Surface(
(self.size[0], self.size[1] - self.base_size * (7+self.resolution_factor)), #change the 7 to move the bar (self.size[0], self.size[1] - self.base_size ), #change the 7 to move the bar
pygame.SRCALPHA) pygame.SRCALPHA)
self.down_bar.fill((0, 0, 0, 200)) self.down_bar.fill((0, 0, 0, 200))
@@ -162,7 +162,7 @@ class ScreenManager():
else: else:
self.screens[self.current_screen].\ self.screens[self.current_screen].\
update(surface, update_type, rects) update(surface, update_type, rects)
surface.blit(self.down_bar, (0, self.base_size * (7+self.resolution_factor))) surface.blit(self.down_bar, (0, self.size[1] - self.base_size))
self.down_bar_objects.render(surface) self.down_bar_objects.render(surface)
if update_type == BaseScreen.update_all or len(rects) < 1: if update_type == BaseScreen.update_all or len(rects) < 1: