QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Change widget order & fix minor bug

Browse Source
This commit is contained in:
Alex Spataru 2020-12-27 20:50:17 -06:00
parent 5c3e72af5d
commit 719d6f69de
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/qml/Windows/DataGrid.qml
View File

@ -354,7 +354,7 @@ Control {
delegate: Item {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.minimumHeight: 196
Layout.minimumHeight: groupDelegate.visible ? 196 : 0
Widgets.GroupDelegate {
id: groupDelegate
@ -380,7 +380,7 @@ Control {
delegate: Item {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.minimumHeight: 196
Layout.minimumHeight: graphDelegate.visible ? 196 : 0
Widgets.GraphDelegate {
id: graphDelegate

38
assets/qml/Windows/Widgets.qml
View File

@ -96,22 +96,6 @@ Control {
columnSpacing: app.spacing
columns: Math.floor(_sv.width / (root.minimumWidgetSize + 2 * app.spacing))
Repeater {
id: accGenerator
delegate: Item {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.minimumWidth: root.minimumWidgetSize
Layout.minimumHeight: root.minimumWidgetSize
Widgets.AccelerometerDelegate {
groupIndex: groupIndex
anchors.fill: parent
}
}
}
Repeater {
id: gyroGenerator
@ -129,7 +113,7 @@ Control {
}
Repeater {
id: barGenerator
id: accGenerator
delegate: Item {
Layout.fillWidth: true
@ -137,8 +121,8 @@ Control {
Layout.minimumWidth: root.minimumWidgetSize
Layout.minimumHeight: root.minimumWidgetSize
Widgets.BarDelegate {
datasetIndex: index
Widgets.AccelerometerDelegate {
groupIndex: groupIndex
anchors.fill: parent
}
}
@ -160,6 +144,22 @@ Control {
}
}
}
Repeater {
id: barGenerator
delegate: Item {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.minimumWidth: root.minimumWidgetSize
Layout.minimumHeight: root.minimumWidgetSize
Widgets.BarDelegate {
datasetIndex: index
anchors.fill: parent
}
}
}
}
Item {