Updated CustomScroller.py

Author: Aeonss

CustomScroller.py

@@ -25,7 +25,7 @@ def __init__(self, master=None, **kw):
 
         self.scroll_flag = True
         self.image_index = 0
-
+        self.top = self.canvas.yview()[1]
 
         # Fill the frame with images
         if self.path != "":
@@ -68,25 +68,7 @@ def mouse_scroll(self, event):
             self.canvas.yview_scroll(self.scroll_speed, "units" )
 
 
-        # If at the top of the scrollbar, load previous images
-        if self.v_scroll.get()[1] < 0.1:
-            if self.scroll_flag and self.image_index - self.image_load >= 0:
-                self.image_index -= self.image_load
-                self.fill(self.image_index)
-                self.scroll_flag = False
-                self.canvas.yview_moveto(1)
-        
-        # If at the bottom of the scrollbar, load next images
-        if self.v_scroll.get()[1] == 1:
-            if self.scroll_flag and self.image_index + self.image_load < len(os.listdir(self.path)):
-                self.image_index += self.image_load
-                self.fill(self.image_index)
-                self.scroll_flag = False
-                self.canvas.yview_moveto(0)
-        
-        # Enable flag to load next images
-        if self.v_scroll.get()[1] > 0.1 and self.v_scroll.get()[1] != 1:
-            self.scroll_flag = True
+        self.checkLoadChapter()
 
 
 
@@ -114,25 +96,7 @@ def update_scroll(self, event):
         self._starting_drag_position =  (event.x, event.y)
 
 
-        # If at the top of the scrollbar, load previous images
-        if self.v_scroll.get()[1] < 0.1:
-            if self.scroll_flag and self.image_index - self.image_load >= 0:
-                self.image_index -= self.image_load
-                self.fill(self.image_index)
-                self.scroll_flag = False
-                self.canvas.yview_moveto(1)
-        
-        # If at the bottom of the scrollbar, load next images
-        if self.v_scroll.get()[1] == 1:
-            if self.scroll_flag and self.image_index + self.image_load < len(os.listdir(self.path)):
-                self.image_index += self.image_load
-                self.fill(self.image_index)
-                self.scroll_flag = False
-                self.canvas.yview_moveto(0)
-        
-        # Enable flag to load next images
-        if self.v_scroll.get()[1] > 0.1 and self.v_scroll.get()[1] != 1:
-            self.scroll_flag = True
+        self.checkLoadChapter()
 
     def stop_scroll(self, event):
         self.canvas.config(xscrollincrement=0) 
@@ -167,6 +131,30 @@ def fill(self, index):
             height = height + self.images[i].height()
 
 
+    def checkLoadChapter(self):
+        
+        # If at the top of the scrollbar, load previous images
+        if self.v_scroll.get()[1] == self.top:
+            if self.scroll_flag and self.image_index - self.image_load >= 0:
+                self.image_index -= self.image_load
+                self.fill(self.image_index)
+                self.scroll_flag = False
+                self.canvas.yview_moveto(1)
+        
+        # If at the bottom of the scrollbar, load next images
+        if self.v_scroll.get()[1] == 1:
+            if self.scroll_flag and self.image_index + self.image_load < len(os.listdir(self.path)):
+                self.image_index += self.image_load
+                self.fill(self.image_index)
+                self.scroll_flag = False
+                self.canvas.yview_moveto(0)
+                self.top = self.canvas.yview()[1]
+                        
+        # Enable flag to load next images
+        if self.v_scroll.get()[1] > self.top and self.v_scroll.get()[1] != 1:
+            self.scroll_flag = True
+
+
     # Natural sort files
     def natural_sort(self, l): 
         convert = lambda text: int(text) if text.isdigit() else text.lower()