diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-25 08:41:40 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 12:44:44 +0000 |
| commit | 3d6d026602cf9a6ccc35655347c2ed6267bbc49f (patch) | |
| tree | bbf7b3e017d50b5c6e3cbb425c279b9d2f6da4b5 /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | 3851ae607c6bb1b77bde99172ebd8a1ff6929c39 (diff) | |
Popup: separate modal and modeless background dimming
iOS generally has white popups on white background, so it must dim the
overlay background also for modeless popups to make them stand out. Make
it possible to have modal and modeless background dimming separately,
because both might be visible at the same time (eg. in Gallery settings).
Change-Id: Id990675c8d06ceb8f8a26e6505d4bd020069f297
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 7191d57f..1611ebaf 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -446,13 +446,30 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const /*! \qmlpropertygroup QtQuick.Controls::ApplicationWindow::overlay \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay - \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.background + \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.modal + \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.modeless - This property holds the window overlay item and its background that implements the - background dimming when any modal popups are open. Popups are automatically + This property holds the window overlay item. Popups are automatically reparented to the overlay. - \sa Popup + \table + \header + \li Property + \li Description + \row + \li overlay.modal + \li This property holds a visual item that implements background + dimming for modal popups. It is stacked below the top-most open + modal popup, or hidden when there are no modal popups open. + \row + \li overlay.modeless + \li This property holds a visual item that implements background + dimming for modeless popups. It is stacked below the top-most + open modeless dimming popup, or hidden when there are no modeless + dimming popups open. + \endtable + + \sa Popup::modal, Popup::dim */ QQuickOverlay *QQuickApplicationWindow::overlay() const { |