[fingerterm] Adjust scroll indicator. Contributes JB#49213

Moves the scroll indicator to the right hand side, where it's less likely to get in the way of the text. Pressing the scroll indicator resets the scroll position.
sailfishos · Feb 5, 2021 · 741222c · 741222c
1 parent 4182ad7
commit 741222c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/qml/Main.qml b/qml/Main.qml
@@ -211,13 +211,23 @@ Item {
                 }
             }
 
-            Image {
-                // terminal buffer scroll indicator
-                source: "icons/scroll-indicator.png"
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.bottom: parent.bottom
+
+            MouseArea {
+                // terminal buffer scroll button
+                x: window.width - width
+                width: scrollImg.width + 60*window.pixelRatio
+                height: scrollImg.height + 30*window.pixelRatio
+                anchors.bottom: textrender.bottom
                 visible: textrender.showBufferScrollIndicator
-                scale: window.pixelRatio
+                onClicked: textrender.scrollToEnd()
+
+                Image {
+                    id: scrollImg
+
+                    anchors.centerIn: parent
+                    source: "icons/scroll-indicator.png"
+                    scale: window.pixelRatio
+                }
             }
 
             TextRender {

diff --git a/textrender.cpp b/textrender.cpp
@@ -437,6 +437,11 @@ QPointF TextRender::scrollBackBuffer(QPointF now, QPointF last)
     return last;
 }
 
+void TextRender::scrollToEnd()
+{
+    sTerm->resetBackBufferScrollPos();
+}
+
 void TextRender::doGesture(PanGesture gesture)
 {
     if( gesture==PanLeft ) {

diff --git a/textrender.h b/textrender.h
@@ -54,6 +54,7 @@ class TextRender : public QQuickPaintedItem
 
     Q_INVOKABLE QPoint cursorPixelPos();
     Q_INVOKABLE QSize cursorPixelSize();
+    Q_INVOKABLE void scrollToEnd();
 
     bool allowGestures();
     void setAllowGestures(bool allow);