Scrollbar in listview working

mopidy_touchscreen/.idea/workspace.xml

@@ -23,16 +23,62 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="touch_screen.py" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/touch_screen.py">
+      <file leaf-file-name="screen_manager.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/screen_manager.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.53699285" vertical-offset="30" max-vertical-offset="990">
-              <caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1034" max-vertical-offset="1440">
+              <caret line="84" column="70" selection-start-line="84" selection-start-column="46" selection-end-line="84" selection-end-column="70" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="tracklist.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tracklist.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
+              <caret line="9" column="176" selection-start-line="9" selection-start-column="176" selection-end-line="9" selection-end-column="176" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="list_view.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/list_view.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="1245">
+              <caret line="53" column="79" selection-start-line="53" selection-start-column="79" selection-end-line="53" selection-end-column="79" />
+              <folding>
+                <element signature="e#0#48#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="screen_objects.py" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/screen_objects.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.10739857" vertical-offset="0" max-vertical-offset="3660">
+              <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#13#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main_screen.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/main_screen.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1396" max-vertical-offset="2025">
+              <caret line="103" column="21" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="21" />
+              <folding>
+                <element signature="e#0#13#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -48,11 +94,11 @@
         <option value="$PROJECT_DIR$/touch_manager.py" />
         <option value="$PROJECT_DIR$/touch_screen_backend.py" />
         <option value="$PROJECT_DIR$/main_screen.py" />
+        <option value="$PROJECT_DIR$/touch_screen.py" />
         <option value="$PROJECT_DIR$/screen_manager.py" />
-        <option value="$PROJECT_DIR$/screen_objects.py" />
-        <option value="$PROJECT_DIR$/list_view.py" />
         <option value="$PROJECT_DIR$/tracklist.py" />
-        <option value="$PROJECT_DIR$/touch_screen.py" />
+        <option value="$PROJECT_DIR$/list_view.py" />
+        <option value="$PROJECT_DIR$/screen_objects.py" />
       </list>
     </option>
   </component>
@@ -293,11 +339,11 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32884902" sideWeight="0.49961567" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -326,7 +372,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2205" max-vertical-offset="2940">
           <caret line="147" column="70" selection-start-line="147" selection-start-column="70" selection-end-line="147" selection-end-column="70" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -349,7 +397,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1470" max-vertical-offset="2775">
           <caret line="98" column="45" selection-start-line="98" selection-start-column="45" selection-end-line="98" selection-end-column="45" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -387,7 +437,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2775">
           <caret line="146" column="36" selection-start-line="146" selection-start-column="36" selection-end-line="146" selection-end-column="36" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -417,7 +469,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="2775">
           <caret line="174" column="33" selection-start-line="174" selection-start-column="33" selection-end-line="174" selection-end-column="33" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -455,7 +509,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2490">
           <caret line="146" column="30" selection-start-line="146" selection-start-column="30" selection-end-line="146" selection-end-column="30" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -486,7 +542,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1193" max-vertical-offset="2490">
           <caret line="146" column="30" selection-start-line="146" selection-start-column="30" selection-end-line="146" selection-end-column="30" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -524,7 +582,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1193" max-vertical-offset="2490">
           <caret line="146" column="30" selection-start-line="146" selection-start-column="30" selection-end-line="146" selection-end-column="30" />
-          <folding />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -663,50 +723,57 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main_screen.py">
+    <entry file="file://$PROJECT_DIR$/touch_screen.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.03937008" vertical-offset="300" max-vertical-offset="1845">
-          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.31980908" vertical-offset="121" max-vertical-offset="990">
+          <caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/screen_manager.py">
+    <entry file="file://$PROJECT_DIR$/main_screen.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1440">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1396" max-vertical-offset="2025">
+          <caret line="103" column="21" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/screen_objects.py">
+    <entry file="file://$PROJECT_DIR$/screen_manager.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2821" max-vertical-offset="3285">
-          <caret line="203" column="41" selection-start-line="203" selection-start-column="41" selection-end-line="203" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1034" max-vertical-offset="1440">
+          <caret line="84" column="70" selection-start-line="84" selection-start-column="46" selection-end-line="84" selection-end-column="70" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/list_view.py">
+    <entry file="file://$PROJECT_DIR$/tracklist.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="59" max-vertical-offset="720">
-          <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
+          <caret line="9" column="176" selection-start-line="9" selection-start-column="176" selection-end-line="9" selection-end-column="176" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tracklist.py">
+    <entry file="file://$PROJECT_DIR$/list_view.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33251232" vertical-offset="0" max-vertical-offset="406">
-          <caret line="9" column="132" selection-start-line="9" selection-start-column="132" selection-end-line="9" selection-end-column="132" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="1245">
+          <caret line="53" column="79" selection-start-line="53" selection-start-column="79" selection-end-line="53" selection-end-column="79" />
+          <folding>
+            <element signature="e#0#48#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/touch_screen.py">
+    <entry file="file://$PROJECT_DIR$/screen_objects.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53699285" vertical-offset="30" max-vertical-offset="990">
-          <caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
-          <folding />
+        <state vertical-scroll-proportion="0.10739857" vertical-offset="0" max-vertical-offset="3660">
+          <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

mopidy_touchscreen/list_view.py

@@ -1,6 +1,8 @@
 from .screen_objects import ScreenObjectsManager
 import logging
 import pygame
+from .touch_manager import TouchManager
+from .touch_manager import TouchEvent
 
 logger = logging.getLogger(__name__)
 
@@ -16,6 +18,7 @@ class ListView():
         self.fonts = fonts
         self.list_size = 0
         self.list = []
+        self.scrollbar = False
         self.set_list([])
 
 
@@ -23,20 +26,52 @@ class ListView():
     def set_list(self, item_list):
         self.list = item_list
         self.list_size = len(item_list)
+        if self.max_rows < self.list_size:
+            self.scrollbar = True
+            self.screen_objects.add_scroll_bar("scrollbar", (self.pos[0]+self.size[0]-self.base_size,self.pos[1]), (self.base_size, self.size[1]),self.list_size,self.max_rows)
+        else:
+            self.scrollbar = False
         self.load_new_item_position(0)
-        logger.error(self.list_size)
-        self.screen_objects.add_scroll_bar("scroll", (self.pos[0]+self.size[0]-self.base_size,self.pos[1]), (self.base_size, self.size[1]),self.list_size,self.max_rows)
 
     def load_new_item_position(self, item_pos):
         self.current_item = item_pos
+        if self.scrollbar:
+            self.screen_objects.clear("scrollbar")
+        else:
+            self.screen_objects.clear(None)
         i = self.current_item
-        logger.error(self.max_rows)
-        while i < self.list_size and i - self.current_item < self.max_rows:
-            self.screen_objects.add_touch_object(str(i),self.fonts['dejavusans'], str(self.list[i]), (self.pos[0],self.pos[1]+self.base_size*i),None, (255, 255, 255))
+        z = 0
+        while i < self.list_size and z < self.max_rows:
+            self.screen_objects.add_touch_object(str(i),self.fonts['dejavusans'], str(self.list[i]), (self.pos[0],self.pos[1]+self.base_size*z),None, (255, 255, 255))
             i += 1
+            z += 1
 
     def render(self, surface):
         self.screen_objects.render(surface)
 
+    def touch_event(self, touch_event):
+        if touch_event.type == TouchManager.click:
+            objects = self.screen_objects.get_touch_objects_in_pos(touch_event.current_pos)
+            if objects is not None:
+                for key in objects:
+                    if key == "scrollbar":
+                        direction = self.screen_objects.get_touch_object(key).touch(touch_event.current_pos)
+                        if direction != 0:
+                            self.move_to(direction)
+
+
+    def move_to(self, direction):
+        if direction == 1:
+            self.current_item += self.max_rows
+            if self.current_item + self.max_rows > self.list_size:
+                self.current_item = self.list_size - self.max_rows
+            self.load_new_item_position(self.current_item)
+            self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)
+        elif direction == -1:
+            self.current_item -= self.max_rows
+            if self.current_item < 0:
+                self.current_item = 0
+            self.load_new_item_position(self.current_item)
+            self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)
 
 

mopidy_touchscreen/screen_manager.py

@@ -82,7 +82,7 @@ class ScreenManager():
                             logger.error(self.core.tracklist.random)
                             self.core.tracklist.random = not self.core.tracklist.random
                             #self.backend.tell({'action':'random','value':random})
-            self.screens[0].touch_event(touch_event)
+            self.screens[self.current_screen].touch_event(touch_event)
 
     def volume_changed(self, volume):
         self.screen_objects_manager.get_touch_object("volume").set_value(volume)

mopidy_touchscreen/screen_objects.py

@@ -1,13 +1,13 @@
 import pygame
 import logging
+import math
 
 logger = logging.getLogger(__name__)
 
-class ScreenObjectsManager():
-
 
+class ScreenObjectsManager():
 
-    def __init__(self,base_size):
+    def __init__(self, base_size):
         self.base_size = base_size
         self.touch_objects = {}
         self.text_objects = {}
@@ -45,6 +45,13 @@ class ScreenObjectsManager():
                 objects.append(key)
         return objects
 
+    def clear(self, mantain):
+        if mantain is not None:
+            object = self.get_touch_object(mantain)
+        self.touch_objects = {}
+        if mantain is not None:
+            self.touch_objects[mantain] = object
+
 
 class BaseItem():
 
@@ -88,7 +95,6 @@ class TextItem(BaseItem):
             self.fit_horizontal = True
             self.fit_vertical = True
 
-
     def update(self):
         if not self.fit_horizontal:
             if self.text == self.original_text:
@@ -105,7 +111,7 @@ class TextItem(BaseItem):
                 new_text = new_text + self.text[:1]
                 self.text = new_text
             else:
-                self.step = self.step + 1
+                self.step += 1
 
     def render(self,surface):
         if self.fit_horizontal:
@@ -120,6 +126,7 @@ class TextItem(BaseItem):
         else:
             TextItem.__init__(self, self.font, text, self.pos, self.pos2, self.color, self.text_size)
 
+
 class TouchObject(BaseItem):
 
     def __init__(self,pos,pos2):
@@ -132,6 +139,7 @@ class TouchObject(BaseItem):
     def set_active(self, active):
         self.active = active
 
+
 class TouchAndTextItem(TouchObject, TextItem):
 
     def __init__(self, font, text, pos, pos2, color,text_size):
@@ -149,6 +157,7 @@ class TouchAndTextItem(TouchObject, TextItem):
             color = (255,255,255)
         TextItem.__init__(self.font,self.text,self.pos,self.pos2,color,self.text_size)
 
+
 class Progressbar(TouchObject, TextItem):
 
     def __init__(self,font,text, pos, pos2, max,size, value_text):
@@ -192,9 +201,11 @@ class Progressbar(TouchObject, TextItem):
     def set_text(self, text):
         self.text.set_text(text , True)
 
+
 class ScrollBar(TouchObject):
 
     def __init__(self, pos, size, max, items_on_screen):
+        BaseItem.__init__(self, pos, (pos[0]+size[0],pos[1]+size[1]))
         self.pos = pos
         self.size = size
         self.max = max
@@ -202,14 +213,27 @@ class ScrollBar(TouchObject):
         self.current_item = 0
         self.back_bar = pygame.Surface(self.size)
         self.back_bar.fill((255,255,255))
+        self.bar_pos = 0
         if self.max < 1:
             self.barsize = self.size[1]
         else:
-            self.barsize = float(self.items_on_screen)/float(self.max) * float(self.size[1])
-        logger.error(self.barsize)
+            self.barsize = math.ceil(float(self.items_on_screen)/float(self.max) * float(self.size[1]))
         self.bar = pygame.Surface((self.size[0],self.barsize))
-        self.bar.fill((255,255,0))
+        self.bar.fill((255, 255, 0))
 
     def render(self, surface):
         surface.blit(self.back_bar, self.pos)
-        surface.blit(self.bar,self.pos)
+        surface.blit(self.bar, (self.pos[0], self.pos[1]+self.bar_pos))
+
+    def touch(self, pos):
+        if pos[1] < self.pos[1]+self.bar_pos:
+            return -1
+        elif pos[1] > self.pos[1] + self.bar_pos + self.barsize:
+            return 1
+        else:
+            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])

mopidy_touchscreen/tracklist.py

@@ -7,10 +7,13 @@ class Tracklist():
         self.size = size
         self.base_size = base_size
         self.list_view = ListView((0,self.base_size),(self.size[0],self.size[1]-2*self.base_size), self.base_size, manager.fonts)
-        self.list_view.set_list(["track 1","track 2","track 1","track 2","track 1","track 2","track 1","track 2","track 1","track 2"])
+        self.list_view.set_list(["track 1","track 2","track 3","track 4","track 5","track 6","track 7","track 8","track 9","track 10","track 11","track 12","track 13","track 14"])
 
     def update(self, screen):
         pass
 
     def update(self, screen):
-        self.list_view.render(screen)
+        self.list_view.render(screen)
+
+    def touch_event(self, touch_event):
+        self.list_view.touch_event(touch_event)