aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-12-12 14:00:30 -0600
committerluigi1111 <luigi1111w@gmail.com>2018-12-12 14:00:30 -0600
commit2d9dc09be9556f789e1f6cada261bee6ed79cacb (patch)
tree82f9d81efcaf8cad6c900a5a0235f4caf88785e9
parent3cf2b7ddbc58251213a8c5fd6c7c6fe4932a049e (diff)
parent7e95253fa25ca1ff47cdaed6259e74058a29ae44 (diff)
downloadmonzero-gui-2d9dc09be9556f789e1f6cada261bee6ed79cacb.tar.gz
monzero-gui-2d9dc09be9556f789e1f6cada261bee6ed79cacb.tar.xz
monzero-gui-2d9dc09be9556f789e1f6cada261bee6ed79cacb.zip
Merge pull request #1804
7e95253 MiddlePanel: use QtQuick.Control scrollbar (selsta)
-rw-r--r--MiddlePanel.qml16
1 files changed, 7 insertions, 9 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 183dd688..71fa639f 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -29,6 +29,7 @@
import QtQml 2.0
import QtQuick 2.2
+import QtQuick.Controls 2
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
@@ -181,21 +182,18 @@ Rectangle {
Layout.fillHeight: true
clip: true
- onFlickingChanged: {
- releaseFocus();
- flickableScroll.flickableContentYChanged();
- }
-
- MoneroComponents.Scroll {
- id: flickableScroll
+ ScrollBar.vertical: ScrollBar {
parent: mainFlickable.parent
anchors.left: parent.right
anchors.leftMargin: 3
anchors.top: parent.top
anchors.bottom: parent.bottom
- flickable: mainFlickable
- scrollWidth: 6
}
+
+ onFlickingChanged: {
+ releaseFocus();
+ }
+
// Views container
StackView {
id: stackView