diff options
Diffstat (limited to 'src/imports/controls')
8 files changed, 2 insertions, 71 deletions
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 85dfd279..235ebf13 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -44,12 +44,4 @@ T.ApplicationWindow { id: window color: window.palette.window - - overlay.modal: Rectangle { - color: Color.transparent(window.palette.shadow, 0.5) - } - - overlay.modeless: Rectangle { - color: Color.transparent(window.palette.shadow, 0.12) - } } diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 5901663a..938b8d42 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -488,9 +488,7 @@ \section2 Customizing ApplicationWindow ApplicationWindow consists of one visual item: - \l {ApplicationWindow::background}{background}. It is also possible - to customize the \l {ApplicationWindow::overlay}{modal} and - \l {ApplicationWindow::overlay}{modeless} items. + \l {ApplicationWindow::background}{background}. \code \QtMinorVersion import QtQuick 2.\1 @@ -505,14 +503,6 @@ GradientStop { position: 1; color: "#c1bbf9" } } } - - overlay.modal: Rectangle { - color: "#8f28282a" - } - - overlay.modeless: Rectangle { - color: "#2f28282a" - } } \endcode diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc index ac2e9cc1..bca826fd 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc @@ -87,11 +87,6 @@ \li active \li .9.png (or .png) \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row \li \l BusyIndicator \li animation \li disabled, running, mirrored, hovered diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/imports/controls/fusion/ApplicationWindow.qml index 30c921cb..26dfbbdf 100644 --- a/src/imports/controls/fusion/ApplicationWindow.qml +++ b/src/imports/controls/fusion/ApplicationWindow.qml @@ -44,12 +44,4 @@ T.ApplicationWindow { id: window color: window.palette.window - - overlay.modal: Rectangle { - color: Fusion.topShadow - } - - overlay.modeless: Rectangle { - color: Fusion.topShadow - } } diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml index 7bfcc3f9..092da1f6 100644 --- a/src/imports/controls/imagine/ApplicationWindow.qml +++ b/src/imports/controls/imagine/ApplicationWindow.qml @@ -43,26 +43,6 @@ import QtQuick.Controls.Imagine.impl 2.12 T.ApplicationWindow { id: window - // ### remove? - overlay.modal: NinePatchImage { - source: Imagine.url + "applicationwindow-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - // ### remove? - overlay.modeless: NinePatchImage { - source: Imagine.url + "applicationwindow-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } - background: NinePatchImage { width: window.width height: window.height diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml index 2c93ba75..8f278621 100644 --- a/src/imports/controls/imagine/Drawer.qml +++ b/src/imports/controls/imagine/Drawer.qml @@ -42,7 +42,7 @@ import QtQuick.Controls.Imagine.impl 2.12 T.Drawer { id: control - parent: T.ApplicationWindow.overlay + parent: T.Overlay.overlay implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding) diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 6a10ed7f..5b8cefac 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -43,14 +43,4 @@ T.ApplicationWindow { id: window color: Material.backgroundColor - - overlay.modal: Rectangle { - color: window.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } - - overlay.modeless: Rectangle { - color: window.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } } diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 153b9e8e..80cda477 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -45,14 +45,6 @@ T.ApplicationWindow { color: Universal.background - overlay.modal: Rectangle { - color: window.Universal.baseLowColor - } - - overlay.modeless: Rectangle { - color: window.Universal.baseLowColor - } - FocusRectangle { parent: window.activeFocusControl width: parent ? parent.width : 0 |