Unverified Commit 825c5ab6 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8926 from DonLakeFlyer/VerticalFactValueGrid

Horizontal scrolling as needed
parents 74fb1dae 6547d68e
...@@ -32,18 +32,25 @@ T.VerticalFactValueGrid { ...@@ -32,18 +32,25 @@ T.VerticalFactValueGrid {
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
QGCFlickable {
width: parent.width
height: topLevelRowLayout.height
flickableDirection: QGCFlickable.HorizontalFlick
contentWidth: topLevelRowLayout.width
RowLayout { RowLayout {
id: topLevelRowLayout id: topLevelRowLayout
width: parent.width spacing: 0
ColumnLayout { ColumnLayout {
Layout.fillWidth: true spacing: 0
GridLayout { GridLayout {
id: valueGrid id: valueGrid
Layout.preferredWidth: _root.width Layout.minimumWidth: _root.width - (columnButtons.visible? columnButtons.width + columnSpacing : 0)
rows: _root.rows.count * 2 rows: _root.rows.count * 2
rowSpacing: 0 rowSpacing: 0
columnSpacing: 5
Repeater { Repeater {
model: _root.rows model: _root.rows
...@@ -109,6 +116,7 @@ T.VerticalFactValueGrid { ...@@ -109,6 +116,7 @@ T.VerticalFactValueGrid {
} }
ColumnLayout { ColumnLayout {
id: columnButtons
Layout.fillHeight: true Layout.fillHeight: true
Layout.bottomMargin: rowButtons.height Layout.bottomMargin: rowButtons.height
width: ScreenTools.minTouchPixels / 2 width: ScreenTools.minTouchPixels / 2
...@@ -155,6 +163,7 @@ T.VerticalFactValueGrid { ...@@ -155,6 +163,7 @@ T.VerticalFactValueGrid {
color: "transparent" color: "transparent"
}*/ }*/
} }
}
Component { Component {
id: valueEditDialog id: valueEditDialog
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment