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

Code cleanup 3

Browse Source
This commit is contained in:
9and3r
2014-07-26 15:56:43 +02:00
parent f36934f076
commit 39eaeaec25
6 changed files with 167 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy_touchscreen/screen_objects.py
View File

@@ -44,7 +44,8 @@ class ScreenObjectsManager():
for key in not_remove:
new_touch[key] = self.get_touch_object(key)
self.touch_objects = new_touch
self.touch_objects = {}
else:
self.touch_objects = {}
class BaseItem():
@@ -72,7 +73,7 @@ class TextItem(BaseItem):
if size is not None:
BaseItem.__init__(self, pos, size)
else:
BaseItem.__init__(self, pos, self.box.get_rect().size)
BaseItem.__init__(self, pos, self.font.size(text))
if size is not None:
if self.pos[0] + self.box.get_rect().width > pos[0] + size[0]:
self.fit_horizontal = False
@@ -86,7 +87,6 @@ class TextItem(BaseItem):
else:
self.fit_vertical = True
else:
BaseItem.__init__(self, pos, (pos[0] + self.box.get_rect().width, pos[1] + self.box.get_rect().height))
self.fit_horizontal = True
self.fit_vertical = True
@@ -220,6 +220,5 @@ class ScrollBar(TouchObject):
return 0
def set_item(self, current_item):
logger.error(current_item)
self.current_item = current_item
self.bar_pos = float(self.current_item)/float(self.max) * float(self.size[1])