Search for UiScrollable in all ancestors not just parent

dtmilano · dtmilano · commit a9bc47440ebe · 2015-02-02T23:47:18.000-05:00
- This fixes Gmail scrollable problem
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -19,7 +19,7 @@
 
 '''
 
-__version__ = '10.0.0'
+__version__ = '10.0.3'
 
 import sys
 import threading
@@ -1253,12 +1253,17 @@ def __init__(self, culebron, view):
                 items.append(ContextMenu.Command('Take view snapshot and save to file',  5, 'Ctrl+W', '<Control-W>', _saveViewSnapshotForSelectedView))
                 if self.view.uiScrollable:
                     items.append(ContextMenu.UiScrollableSubMenu(self, 'UiScrollable', view, culebron))
-                elif self.view.parent.uiScrollable:
-                    # WARNING:
-                    # A bit dangerous, but may work
-                    # If we click ona ListView then the View pased to this ContextMenu is the child,
-                    # perhaps we want to scroll the parent
-                    items.append(ContextMenu.UiScrollableSubMenu(self, 'UiScrollable', view.parent, culebron))
+                else:
+                    parent = self.view.parent
+                    while parent:
+                        if parent.uiScrollable:
+                            # WARNING:
+                            # A bit dangerous, but may work
+                            # If we click ona ListView then the View pased to this ContextMenu is the child,
+                            # perhaps we want to scroll the parent
+                            items.append(ContextMenu.UiScrollableSubMenu(self, 'UiScrollable', parent, culebron))
+                            break
+                        parent = parent.parent
                 items.append(ContextMenu.Separator())
             
             items.append(ContextMenu.Command('Drag dialog',                  0,      'Ctrl+D',   '<Control-D>',  culebron.showDragDialog))
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -1155,8 +1155,9 @@ def flingBackward(self):
             e = (self.x + self.w/2, self.y + self.h - self.h * self.swipeDeadZonePercentage)
         else:
             raise RuntimeError('Not implemented yet')
-        print >> sys.stderr, "flingBackward: view=", self.view.__smallStr__(), self.view.getPositionAndSize()
-        print >> sys.stderr, "self.view.device.drag(%s, %s, %s, %s)" % (s, e, self.duration, self.steps)
+        if DEBUG:
+            print >> sys.stderr, "flingBackward: view=", self.view.__smallStr__(), self.view.getPositionAndSize()
+            print >> sys.stderr, "self.view.device.drag(%s, %s, %s, %s)" % (s, e, self.duration, self.steps)
         self.view.device.drag(s, e, self.duration, self.steps, 0)
     
     def flingForward(self):
@@ -1165,8 +1166,9 @@ def flingForward(self):
             e = (self.x + self.w/2, self.y + self.h * self.swipeDeadZonePercentage)
         else:
             raise RuntimeError('Not implemented yet')
-        print >> sys.stderr, "flingForward: view=", self.view.__smallStr__(), self.view.getPositionAndSize()
-        print >> sys.stderr, "self.view.device.drag(%s, %s, %s, %s)" % (s, e, self.duration, self.steps)
+        if DEBUG:
+            print >> sys.stderr, "flingForward: view=", self.view.__smallStr__(), self.view.getPositionAndSize()
+            print >> sys.stderr, "self.view.device.drag(%s, %s, %s, %s)" % (s, e, self.duration, self.steps)
         self.view.device.drag(s, e, self.duration, self.steps, 0)
     
     def flingToBeginning(self, maxSwipes):
