aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickoverlay_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-25 08:41:40 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-27 12:44:44 +0000
commit3d6d026602cf9a6ccc35655347c2ed6267bbc49f (patch)
treebbf7b3e017d50b5c6e3cbb425c279b9d2f6da4b5 /src/quicktemplates2/qquickoverlay_p.h
parent3851ae607c6bb1b77bde99172ebd8a1ff6929c39 (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/qquickoverlay_p.h')
-rw-r--r--src/quicktemplates2/qquickoverlay_p.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h
index 78916036..4b6cb9c7 100644
--- a/src/quicktemplates2/qquickoverlay_p.h
+++ b/src/quicktemplates2/qquickoverlay_p.h
@@ -58,16 +58,21 @@ class QQuickOverlayPrivate;
class Q_QUICKTEMPLATES2_EXPORT QQuickOverlay : public QQuickItem
{
Q_OBJECT
- Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
+ Q_PROPERTY(QQuickItem *modal READ modal WRITE setModal NOTIFY modalChanged FINAL)
+ Q_PROPERTY(QQuickItem *modeless READ modeless WRITE setModeless NOTIFY modelessChanged FINAL)
public:
explicit QQuickOverlay(QQuickItem *parent = nullptr);
- QQuickItem *background() const;
- void setBackground(QQuickItem *background);
+ QQuickItem *modal() const;
+ void setModal(QQuickItem *modal);
+
+ QQuickItem *modeless() const;
+ void setModeless(QQuickItem *modeless);
Q_SIGNALS:
- void backgroundChanged();
+ void modalChanged();
+ void modelessChanged();
void pressed();
void released();