summaryrefslogtreecommitdiff
path: root/src/controls/ApplicationWindow.qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
-rw-r--r--src/controls/ApplicationWindow.qml31
1 files changed, 25 insertions, 6 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index b739ecae..7d215556 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick.Window 2.2
import QtQuick 2.2
import QtQuick.Controls 1.2
@@ -171,19 +172,21 @@ Window {
/*! \internal */
property real __width: 0
- Binding {
+ Qml.Binding {
target: root
property: "__width"
when: (root.minimumWidth <= root.maximumWidth) && !contentArea.__noImplicitWidthGiven
value: Math.max(Math.min(root.maximumWidth, contentArea.implicitWidth), root.minimumWidth)
+ restoreMode: Binding.RestoreBinding
}
/*! \internal */
property real __height: 0
- Binding {
+ Qml.Binding {
target: root
property: "__height"
when: (root.minimumHeight <= root.maximumHeight) && !contentArea.__noImplicitHeightGiven
value: Math.max(Math.min(root.maximumHeight, contentArea.implicitHeight + __topBottomMargins), root.minimumHeight)
+ restoreMode: Binding.RestoreBinding
}
/* As soon as an application developer writes
width: 200
@@ -224,16 +227,32 @@ Window {
onStatusChanged: if (status === Loader.Error) console.error("Failed to load Style for", root)
}
- Binding { target: toolBar; property: "parent"; value: __panel.toolBarArea }
- Binding { target: statusBar; property: "parent"; value: __panel.statusBarArea }
+ Qml.Binding {
+ target: toolBar
+ property: "parent"
+ value: __panel.toolBarArea
+ restoreMode: Binding.RestoreBinding
+ }
+ Qml.Binding {
+ target: statusBar
+ property: "parent"
+ value: __panel.statusBarArea
+ restoreMode: Binding.RestoreBinding
+ }
- Binding {
+ Qml.Binding {
property: "parent"
target: menuBar ? menuBar.__contentItem : null
when: menuBar && !menuBar.__isNative
value: __panel.menuBarArea
+ restoreMode: Binding.RestoreBinding
+ }
+ Qml.Binding {
+ target: menuBar
+ property: "__parentWindow"
+ value: root
+ restoreMode: Binding.RestoreBinding
}
- Binding { target: menuBar; property: "__parentWindow"; value: root }
Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : []