Merge pull request #96 from ceccopierangiolieugenio/scrollbars_fix

Added scrollArea missing methods

TermTk/TTkAbstract/abstractscrollarea.py

@@ -42,8 +42,8 @@ class TTkAbstractScrollArea(TTkWidget):
         self.setLayout(TTkGridLayout())
         self._verticalScrollBar = TTkScrollBar(orientation=TTkK.VERTICAL)
         self._horizontalScrollBar = TTkScrollBar(orientation=TTkK.HORIZONTAL)
-        self._verticalScrollBarPolicy = TTkK.ScrollBarAsNeeded
-        self._horizontalScrollBarPolicy = TTkK.ScrollBarAsNeeded
+        self._verticalScrollBarPolicy   = kwargs.get("verticalScrollBarPolicy",  TTkK.ScrollBarAsNeeded)
+        self._horizontalScrollBarPolicy = kwargs.get("horizontalScrollBarPolicy",TTkK.ScrollBarAsNeeded)
 
     @pyTTkSlot()
     def _viewportChanged(self):
@@ -74,7 +74,7 @@ class TTkAbstractScrollArea(TTkWidget):
         elif self._verticalScrollBarPolicy == TTkK.ScrollBarAlwaysOn:
             self._verticalScrollBar.show()
         else:
-            self._verticalScrollBar.show()
+            self._verticalScrollBar.hide()
 
         if self._horizontalScrollBarPolicy == TTkK.ScrollBarAsNeeded:
             if hrange<=0:
@@ -85,7 +85,7 @@ class TTkAbstractScrollArea(TTkWidget):
         elif self._horizontalScrollBarPolicy == TTkK.ScrollBarAlwaysOn:
             self._horizontalScrollBar.show()
         else:
-            self._horizontalScrollBar.show()
+            self._horizontalScrollBar.hide()
 
     @pyTTkSlot(int)
     def _vscrollMoved(self, val):
@@ -114,10 +114,14 @@ class TTkAbstractScrollArea(TTkWidget):
         self.layout().addWidget(self._horizontalScrollBar,1,0)
 
     def setVerticalScrollBarPolicy(self, policy):
-        self._verticalScrollBarPolicy = policy
+        if policy != self._verticalScrollBarPolicy:
+            self._verticalScrollBarPolicy = policy
+            self._viewportChanged()
 
     def setHorizontalScrollBarPolicy(self, policy):
-        self._horizontalScrollBarPolicy = policy
+        if policy != self._horizontalScrollBarPolicy:
+            self._horizontalScrollBarPolicy = policy
+            self._viewportChanged()
 
     def viewport(self):
         return self._viewport

TermTk/TTkAbstract/abstractscrollview.py

@@ -91,6 +91,11 @@ class TTkAbstractScrollView(TTkWidget, TTkAbstractScrollViewInterface):
         self.viewSizeChanged.emit(w,h)
         self.viewChanged.emit()
 
+    def update(self, repaint=True, updateLayout=False, updateParent=False):
+        if updateLayout:
+            self.viewChanged.emit()
+        return super().update(repaint, updateLayout, updateParent)
+
 class TTkAbstractScrollViewGridLayout(TTkGridLayout, TTkAbstractScrollViewInterface):
     __slots__ = (
         '_viewOffsetX', '_viewOffsetY',

tests/test.ui.015.scrollArea.02.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+
+# MIT License
+#
+# Copyright (c) 2021 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import sys, os, argparse, math, random
+
+sys.path.append(os.path.join(sys.path[0],'..'))
+import TermTk as ttk
+
+def demoScrollArea(root):
+    w1 = ttk.TTkWindow(parent=root,pos=(0,0), size=(50,20), title="sa1", border=True, layout=ttk.TTkGridLayout())
+    sa1 = ttk.TTkScrollArea(parent=w1)
+    ttk.TTkTestWidgetSizes(pos=(0,0)   , size=(40,10), parent=sa1.viewport(), border=True)
+    ttk.TTkTestWidgetSizes(pos=(10,15) , size=(40,10), parent=sa1.viewport(), border=True)
+
+    w2 = ttk.TTkWindow(parent=root,pos=(10,10), size=(50,20), title="sa2 - Vertical Off", border=True, layout=ttk.TTkGridLayout())
+    sa2 = ttk.TTkScrollArea(parent=w2, verticalScrollBarPolicy=ttk.TTkK.ScrollBarAlwaysOff)
+    ttk.TTkTestWidgetSizes(pos=(0,0)   , size=(40,10), parent=sa2.viewport(), border=True)
+    ttk.TTkTestWidgetSizes(pos=(10,15) , size=(40,10), parent=sa2.viewport(), border=True)
+
+    w3 = ttk.TTkWindow(parent=root,pos=(20,20), size=(50,20), title="sa3 - Horizontal Off", border=True, layout=ttk.TTkGridLayout())
+    sa3 = ttk.TTkScrollArea(parent=w3, horizontalScrollBarPolicy=ttk.TTkK.ScrollBarAlwaysOff)
+    ttk.TTkTestWidgetSizes(pos=(0,0)   , size=(40,10), parent=sa3.viewport(), border=True)
+    ttk.TTkTestWidgetSizes(pos=(10,15) , size=(40,10), parent=sa3.viewport(), border=True)
+
+    ttk.TTkLabel(             parent=root, pos=(55,0), size=(15,1), text="sa1 - Vertical Scrollbar:" )
+    vsb1 = ttk.TTkRadioButton(parent=root, pos=(55,1), size=(15,1), text="As Needed" , name="VSB", checked=True)
+    vsb2 = ttk.TTkRadioButton(parent=root, pos=(55,2), size=(15,1), text="Always On" , name="VSB")
+    vsb3 = ttk.TTkRadioButton(parent=root, pos=(55,3), size=(15,1), text="Always Off", name="VSB")
+
+    ttk.TTkLabel(             parent=root, pos=(55,5), size=(15,1), text="sa1 - Horizontal Scrollbar:" )
+    hsb1 = ttk.TTkRadioButton(parent=root, pos=(55,6), size=(15,1), text="As Needed" , name="HSB", checked=True)
+    hsb2 = ttk.TTkRadioButton(parent=root, pos=(55,7), size=(15,1), text="Always On" , name="HSB")
+    hsb3 = ttk.TTkRadioButton(parent=root, pos=(55,8), size=(15,1), text="Always Off", name="HSB")
+
+    vsb1.clicked.connect(lambda : sa1.setVerticalScrollBarPolicy(ttk.TTkK.ScrollBarAsNeeded))
+    vsb2.clicked.connect(lambda : sa1.setVerticalScrollBarPolicy(ttk.TTkK.ScrollBarAlwaysOn))
+    vsb3.clicked.connect(lambda : sa1.setVerticalScrollBarPolicy(ttk.TTkK.ScrollBarAlwaysOff))
+
+    hsb1.clicked.connect(lambda : sa1.setHorizontalScrollBarPolicy(ttk.TTkK.ScrollBarAsNeeded))
+    hsb2.clicked.connect(lambda : sa1.setHorizontalScrollBarPolicy(ttk.TTkK.ScrollBarAlwaysOn))
+    hsb3.clicked.connect(lambda : sa1.setHorizontalScrollBarPolicy(ttk.TTkK.ScrollBarAlwaysOff))
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-f', help='Full Screen', action='store_true')
+    args = parser.parse_args()
+
+    ttk.TTkLog.use_default_file_logging()
+
+    root = ttk.TTk()
+    if args.f:
+        rootGraph = root
+    else:
+        rootGraph = ttk.TTkWindow(parent=root,pos=(1,1), size=(150,50), title="Test Graph", border=True)
+    demoScrollArea(rootGraph)
+    root.mainloop()
+
+if __name__ == "__main__":
+    main()