Merge branch 'background-cover' into develop

Conflicts:
	mopidy_touchscreen/dynamic_background.py
	mopidy_touchscreen/screens/main_screen.py
This commit is contained in:
Ander
2015-04-09 00:52:53 +02:00

View File

@@ -28,7 +28,6 @@ class ScreenManager():
self.core = core self.core = core
self.cache = cache self.cache = cache
self.fonts = {} self.fonts = {}
self.background = DynamicBackground()
self.current_screen = library_index self.current_screen = library_index
# Init variables in init # Init variables in init
@@ -45,6 +44,8 @@ class ScreenManager():
def init_manager(self, size): def init_manager(self, size):
self.size = size self.size = size
self.background = DynamicBackground(self.size)
self.current_screen = 0
self.base_size = self.size[1] / 8 self.base_size = self.size[1] / 8
font = resource_filename( font = resource_filename(
Requirement.parse("mopidy-touchscreen"), Requirement.parse("mopidy-touchscreen"),