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 conflicts

Browse Source
This commit is contained in:
Ander
2015-04-09 01:31:24 +02:00
parent 9102cd9e91
commit c862c57286
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mopidy_touchscreen/screen_manager.py
View File

@@ -38,10 +38,6 @@ class ScreenManager():
self.track = None self.track = None
self.input_manager = InputManager(size) self.input_manager = InputManager(size)
self.down_bar_objects = ScreenObjectsManager() self.down_bar_objects = ScreenObjectsManager()
<<<<<<< HEAD
self.down_bar_solid = None
=======
>>>>>>> background-cover
self.down_bar = None self.down_bar = None
self.init_manager(size) self.init_manager(size)
@@ -135,16 +131,8 @@ class ScreenManager():
self.change_screen(self.current_screen) self.change_screen(self.current_screen)
def update(self): def update(self):
<<<<<<< HEAD
surface = pygame.Surface(self.size)
self.background.draw_background([surface,
self.down_bar_solid])
self.screens[self.current_screen].update(surface)
surface.blit(self.down_bar_solid, (0, self.base_size * 7))
=======
surface = self.background.draw_background() surface = self.background.draw_background()
self.screens[self.current_screen].update(surface) self.screens[self.current_screen].update(surface)
>>>>>>> background-cover
surface.blit(self.down_bar, (0, self.base_size * 7)) surface.blit(self.down_bar, (0, self.base_size * 7))
self.down_bar_objects.render(surface) self.down_bar_objects.render(surface)
return surface return surface