diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-05 13:31:53 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-08 15:44:27 +0200 |
commit | 31fbd97b0e39e14f79d0d7be6fd277ebd6a2fa7a (patch) | |
tree | f5dcaf269f0e8f7e90b291b37b255f52dff99e94 /src | |
parent | ed1ec14b6aca705bfd4e08a8a846bf8d940edeb2 (diff) |
ApplicationWindow: remove deprecated overlay API
[ChangeLog][Controls][ApplicationWindow] The deprecated overlay
properties and attached API were removed. Use the Overlay attached type
instead.
Task-number: QTBUG-84715
Change-Id: I0781ea55ea502ffe5277385e82492291724d2090
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/ApplicationWindow.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc | 12 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc | 5 | ||||
-rw-r--r-- | src/imports/controls/fusion/ApplicationWindow.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/imagine/ApplicationWindow.qml | 20 | ||||
-rw-r--r-- | src/imports/controls/imagine/Drawer.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/ApplicationWindow.qml | 10 | ||||
-rw-r--r-- | src/imports/controls/universal/ApplicationWindow.qml | 8 | ||||
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 72 | ||||
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow_p.h | 7 | ||||
-rw-r--r-- | src/quicktemplates2/qquickoverlay.cpp | 4 |
11 files changed, 2 insertions, 154 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 diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index d7ff9a26..dda1b973 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -36,7 +36,6 @@ #include "qquickapplicationwindow_p.h" #include "qquickcontentitem_p.h" -#include "qquickoverlay_p.h" #include "qquickpopup_p_p.h" #include "qquickcontrol_p_p.h" #include "qquicktextarea_p.h" @@ -178,7 +177,6 @@ public: QQuickItem *menuBar = nullptr; QQuickItem *header = nullptr; QQuickItem *footer = nullptr; - QQuickOverlay *overlay = nullptr; QFont font; QLocale locale; QQuickItem *activeFocusControl = nullptr; @@ -589,57 +587,6 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const } /*! - \deprecated - \qmlpropertygroup QtQuick.Controls::ApplicationWindow::overlay - \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay - \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modal - \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modeless - - Use the \l Overlay attached properties and signals instead. - - This property holds the window overlay item. Popups are automatically - reparented to the overlay. - - \table - \header - \li Property - \li Description - \row - \li overlay.modal - \li This property holds a component to use as a visual item that implements - background dimming for modal popups. It is created for and stacked below - visible modal popups. - \row - \li overlay.modeless - \li This property holds a component to use as a visual item that implements - background dimming for modeless popups. It is created for and stacked below - visible dimming popups. - \row - \li overlay.pressed() - \li This signal is emitted when the overlay is pressed by the user while - a popup is visible. - \row - \li overlay.released() - \li This signal is emitted when the overlay is released by the user while - a modal popup is visible. - \endtable - - \sa Popup::modal, Popup::dim -*/ -QQuickOverlay *QQuickApplicationWindow::overlay() const -{ - QQuickApplicationWindowPrivate *d = const_cast<QQuickApplicationWindowPrivate *>(d_func()); - if (!d) // being deleted - return nullptr; - - if (!d->overlay) { - d->overlay = new QQuickOverlay(QQuickWindow::contentItem()); - d->overlay->stackAfter(QQuickApplicationWindow::contentItem()); - } - return d->overlay; -} - -/*! \qmlproperty font QtQuick.Controls::ApplicationWindow::font This property holds the font currently set for the window. @@ -852,7 +799,6 @@ void QQuickApplicationWindowAttachedPrivate::windowChange(QQuickWindow *wnd) window = wnd; emit q->windowChanged(); emit q->contentItemChanged(); - emit q->overlayChanged(); activeFocusChange(); if ((oldWindow && oldWindow->menuBar()) || (newWindow && newWindow->menuBar())) @@ -986,24 +932,6 @@ QQuickItem *QQuickApplicationWindowAttached::footer() const } /*! - \deprecated - \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::overlay - \readonly - - Use the \l Overlay::overlay attached property instead. - - This attached property holds the window overlay item. The property can be attached - to any item. The value is \c null if the item is not in an ApplicationWindow. - - \sa {Attached ApplicationWindow Properties} -*/ -QQuickOverlay *QQuickApplicationWindowAttached::overlay() const -{ - Q_D(const QQuickApplicationWindowAttached); - return QQuickOverlay::overlay(d->window); -} - -/*! \since QtQuick.Controls 2.3 (Qt 5.10) \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::menuBar \readonly diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index 14ef6c67..9c0292ed 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE -class QQuickOverlay; class QQuickApplicationWindowPrivate; class QQuickApplicationWindowAttached; class QQuickApplicationWindowAttachedPrivate; @@ -70,7 +69,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWi Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) - Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) // 2.3 (Qt 5.10) @@ -99,8 +97,6 @@ public: QQuickItem *footer() const; void setFooter(QQuickItem *footer); - QQuickOverlay *overlay() const; - QFont font() const; void setFont(const QFont &font); void resetFont(); @@ -141,7 +137,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowAttached : public Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer NOTIFY footerChanged FINAL) - Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) Q_PROPERTY(QQuickItem *menuBar READ menuBar NOTIFY menuBarChanged FINAL) // REVISION 3 public: @@ -152,7 +147,6 @@ public: QQuickItem *activeFocusControl() const; QQuickItem *header() const; QQuickItem *footer() const; - QQuickOverlay *overlay() const; QQuickItem *menuBar() const; Q_SIGNALS: @@ -161,7 +155,6 @@ Q_SIGNALS: void activeFocusControlChanged(); void headerChanged(); void footerChanged(); - void overlayChanged(); // 2.3 (Qt 5.10) /*Q_REVISION(3)*/ void menuBarChanged(); diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 6eb0d0e8..661dc9e0 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -368,10 +368,6 @@ QQuickOverlay *QQuickOverlay::overlay(QQuickWindow *window) if (!window) return nullptr; - QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow *>(window); - if (applicationWindow) - return applicationWindow->overlay(); - const char *name = "_q_QQuickOverlay"; QQuickOverlay *overlay = window->property(name).value<QQuickOverlay *>(); if (!overlay) { |