Skip to content

Q
qgroundcontrol
Commit 5ce2162f authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix toolbar messages

parent cb05a3f5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/ui/toolbar/MainToolBar.qml
View file @ 5ce2162f
...@@ -69,9 +69,9 @@ Item { ...@@ -69,9 +69,9 @@ Item {
function showToolbarMessage(message) { function showToolbarMessage(message) {
toolBarMessage.text = message toolBarMessage.text = message
if (toolBarMessage.contentHeight > toolBarMessageCloseButton.height) { if (toolBarMessage.contentHeight > toolBarMessageCloseButton.height) {
mainToolBar.height = toolBarHeight + toolBarMessage.contentHeight + (verticalMargins * 2) toolBarHolder.height = toolBarHeight + toolBarMessage.contentHeight + (verticalMargins * 2)
} else { } else {
mainToolBar.height = toolBarHeight + toolBarMessageCloseButton.height + (verticalMargins * 2) toolBarHolder.height = toolBarHeight + toolBarMessageCloseButton.height + (verticalMargins * 2)
} }
toolBarMessageArea.visible = true toolBarMessageArea.visible = true
} }
...@@ -864,7 +864,7 @@ Item { ...@@ -864,7 +864,7 @@ Item {
onClicked: { onClicked: {
parent.visible = false parent.visible = false
_controller.height = toolBarHeight toolBarHolder.height = toolBarHeight
_controller.onToolBarMessageClosed() _controller.onToolBarMessageClosed()
} }
} }
......
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