Make sure we never get in-panel scrolling when we shouldn'
This commit is contained in:
@@ -207,6 +207,7 @@ BarWidget {
|
|||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
interactive: contentHeight > height
|
||||||
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
|
|||||||
@@ -584,7 +584,12 @@ Panel {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
ScrollBar.vertical.policy: panelColumn.implicitHeight > height ? ScrollBar.AsNeeded : ScrollBar.AlwaysOff
|
||||||
|
Binding {
|
||||||
|
target: scrollArea.contentItem
|
||||||
|
property: "interactive"
|
||||||
|
value: panelColumn.implicitHeight > scrollArea.height
|
||||||
|
}
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: panelColumn
|
id: panelColumn
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ Panel {
|
|||||||
readonly property bool rotatingPhrases: adapter && adapter.enabled
|
readonly property bool rotatingPhrases: adapter && adapter.enabled
|
||||||
readonly property string heroStatusText: {
|
readonly property string heroStatusText: {
|
||||||
if (!adapter) return "No adapter"
|
if (!adapter) return "No adapter"
|
||||||
if (!adapter.enabled) return "Bluetooth off"
|
if (!adapter.enabled) return "Turned Off"
|
||||||
return activePhrases[phraseIndex % activePhrases.length]
|
return activePhrases[phraseIndex % activePhrases.length]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -624,6 +624,7 @@ Panel {
|
|||||||
contentHeight: deviceList.implicitHeight
|
contentHeight: deviceList.implicitHeight
|
||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
|
interactive: contentHeight > height
|
||||||
|
|
||||||
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
||||||
|
|
||||||
|
|||||||
@@ -215,6 +215,7 @@ Panel {
|
|||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
interactive: contentHeight > height
|
||||||
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
|
|||||||
@@ -382,7 +382,12 @@ Panel {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
ScrollBar.vertical.policy: panelColumn.implicitHeight > height ? ScrollBar.AsNeeded : ScrollBar.AlwaysOff
|
||||||
|
Binding {
|
||||||
|
target: scrollArea.contentItem
|
||||||
|
property: "interactive"
|
||||||
|
value: panelColumn.implicitHeight > scrollArea.height
|
||||||
|
}
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: panelColumn
|
id: panelColumn
|
||||||
|
|||||||
@@ -445,6 +445,7 @@ Panel {
|
|||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
interactive: contentHeight > height
|
||||||
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
|
|||||||
@@ -245,6 +245,7 @@ Panel {
|
|||||||
contentHeight: weatherColumn.implicitHeight
|
contentHeight: weatherColumn.implicitHeight
|
||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
|
interactive: contentHeight > height
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: weatherColumn
|
id: weatherColumn
|
||||||
|
|||||||
Reference in New Issue
Block a user