mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 20:20:02 +00:00
Merge pull request #1804
7e95253
MiddlePanel: use QtQuick.Control scrollbar (selsta)
This commit is contained in:
commit
2d9dc09be9
1 changed files with 7 additions and 9 deletions
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
import QtQml 2.0
|
import QtQml 2.0
|
||||||
import QtQuick 2.2
|
import QtQuick 2.2
|
||||||
|
import QtQuick.Controls 2
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts 1.1
|
||||||
import QtGraphicalEffects 1.0
|
import QtGraphicalEffects 1.0
|
||||||
|
@ -181,21 +182,18 @@ Rectangle {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
onFlickingChanged: {
|
ScrollBar.vertical: ScrollBar {
|
||||||
releaseFocus();
|
|
||||||
flickableScroll.flickableContentYChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
MoneroComponents.Scroll {
|
|
||||||
id: flickableScroll
|
|
||||||
parent: mainFlickable.parent
|
parent: mainFlickable.parent
|
||||||
anchors.left: parent.right
|
anchors.left: parent.right
|
||||||
anchors.leftMargin: 3
|
anchors.leftMargin: 3
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
flickable: mainFlickable
|
|
||||||
scrollWidth: 6
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onFlickingChanged: {
|
||||||
|
releaseFocus();
|
||||||
|
}
|
||||||
|
|
||||||
// Views container
|
// Views container
|
||||||
StackView {
|
StackView {
|
||||||
id: stackView
|
id: stackView
|
||||||
|
|
Loading…
Reference in a new issue