Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -rf463d5a69bb97d84de2c835984619ac18c574da2 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision f463d5a69bb97d84de2c835984619ac18c574da2) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -17,7 +17,6 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports @@ -45,8 +44,7 @@ } - Flickable { - id: _flickable + Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -55,9 +53,19 @@ contentHeight: _column.implicitHeight clip: true - Column { - id: _column - spacing: Variables.cTreatmentSpacing + ScrollBar.vertical: ScrollBar { id: _scrollBar + anchors.right: _flickable.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + + Column { id: _column + spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -68,7 +76,7 @@ font.pixelSize: Fonts.fontPixelTitle } - TouchRect { id : _continueRect + TouchRect { anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("CONTINUE TO TREATMENT") button.onClicked: { @@ -78,36 +86,6 @@ } } - states: [ - State { - when: _flickable.movingVertically - PropertyChanges { - target: _verticalScrollBar - opacity: 0.8 - } - } - ] - - ScrollBar { - anchors.top: _flickable.top - anchors.bottom: _flickable.bottom - id: _verticalScrollBar - size: _flickable.height / _column.implicitHeight - active: true - anchors.right: _flickable.right - anchors.rightMargin: 5 - opacity: 0 - orientation: Qt.Vertical - position: _flickable.visibleArea.yPosition - - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true