Skip to content

Q
qgroundcontrol
Commit ae16fc1f authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4960 from DonLakeFlyer/ToolStrip 

Fix ToolStrip sizing/visability
parents 682ea675 2557c160
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ ae16fc1f
...@@ -343,7 +343,7 @@ QGCView { ...@@ -343,7 +343,7 @@ QGCView {
} }
ToolStrip { ToolStrip {
visible: _activeVehicle ? _activeVehicle.guidedModeSupported : false visible: _activeVehicle ? _activeVehicle.guidedModeSupported : true
id: toolStrip id: toolStrip
anchors.leftMargin: ScreenTools.defaultFontPixelWidth anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.left: _panel.left anchors.left: _panel.left
......
src/QmlControls/ToolStrip.qml
View file @ ae16fc1f
...@@ -41,11 +41,8 @@ Rectangle { ...@@ -41,11 +41,8 @@ Rectangle {
property bool _showOptionalElements: true property bool _showOptionalElements: true
property bool _needRecalc: false property bool _needRecalc: false
Component.onCompleted: recalcShowOptionalElements() Component.onCompleted: recalcShowOptionalElements()
onMaxHeightChanged: recalcShowOptionalElements() onMaxHeightChanged: recalcShowOptionalElements()
onModelChanged: recalcShowOptionalElements()
onButtonVisibleChanged: recalcShowOptionalElements()
Connections { Connections {
target: ScreenTools target: ScreenTools
......
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