Merge branch '3.4'

This commit is contained in:
Mark 2018-07-02 16:37:04 +02:00
commit c0e97b9529
3 changed files with 3 additions and 0 deletions

View file

@ -14,6 +14,7 @@ Item
frameVisible: false frameVisible: false
anchors.fill: detailList anchors.fill: detailList
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
anchors anchors

View file

@ -12,6 +12,7 @@ ScrollView
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
width: parent.width - 2 * padding width: parent.width - 2 * padding

View file

@ -15,6 +15,7 @@ ScrollView
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height