diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-01 14:44:53 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-26 15:35:25 +0000 |
commit | d0fdebbc378f2d5c1993eee56b63e27bcff04ca5 (patch) | |
tree | 848f544ac0b1575751c679f2860f6b345003f398 /src/imports/controls/universal | |
parent | 5dfa85e68c6a9fc3fbedb47737dd34c843e2ba2b (diff) |
Add Overlay attached properties and signals
[ChangeLog][Controls][ApplicationWindow] Deprecated the overlay grouped
property in favor of the newly introduced Overlay attached properties.
[ChangeLog][Controls][Overlay] Introduced Overlay attached properties
and signals that supersede the overlay grouped property in Application
Window. The Overlay attached type allows providing background dimming
for popups without requiring an ApplicationWindow instance.
Task-number: QTBUG-61336
Change-Id: I9df11bcb167e7725014d5f058fe24d70da4a10b3
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
-rw-r--r-- | src/imports/controls/universal/Dialog.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/universal/Drawer.qml | 10 | ||||
-rw-r--r-- | src/imports/controls/universal/Menu.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/universal/Popup.qml | 8 |
4 files changed, 33 insertions, 1 deletions
diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index 4f8a6180..dd463b83 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -84,4 +84,12 @@ T.Dialog { footer: DialogButtonBox { visible: count > 0 } + + T.Overlay.modal: Rectangle { + color: control.Universal.baseLowColor + } + + T.Overlay.modeless: Rectangle { + color: control.Universal.baseLowColor + } } diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 5ef0b325..40cfaadd 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -41,7 +41,7 @@ import QtQuick.Controls.Universal 2.3 T.Drawer { id: control - parent: T.ApplicationWindow.overlay + parent: T.Overlay.overlay implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) @@ -68,4 +68,12 @@ T.Drawer { y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 } } + + T.Overlay.modal: Rectangle { + color: control.Universal.baseLowColor + } + + T.Overlay.modeless: Rectangle { + color: control.Universal.baseLowColor + } } diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 8ffefb1b..8b69051f 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -70,4 +70,12 @@ T.Menu { border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness } + + T.Overlay.modal: Rectangle { + color: control.Universal.baseLowColor + } + + T.Overlay.modeless: Rectangle { + color: control.Universal.baseLowColor + } } diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index f844d8e1..e44e953c 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -56,4 +56,12 @@ T.Popup { border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness } + + T.Overlay.modal: Rectangle { + color: control.Universal.baseLowColor + } + + T.Overlay.modeless: Rectangle { + color: control.Universal.baseLowColor + } } |