Browse Source

Fix toolbar messages

QGC4.4
Don Gagne 10 years ago
parent
commit
5ce2162f05
  1. 6
      src/ui/toolbar/MainToolBar.qml

6
src/ui/toolbar/MainToolBar.qml

@ -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 {
onClicked: { onClicked: {
parent.visible = false parent.visible = false
_controller.height = toolBarHeight toolBarHolder.height = toolBarHeight
_controller.onToolBarMessageClosed() _controller.onToolBarMessageClosed()
} }
} }

Loading…
Cancel
Save