diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 18:23:00 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 18:24:30 +0200 |
commit | 6d36375fe3559f420a15b8240ed32679358a19e7 (patch) | |
tree | 16d20788d187dcd1c5de343955b867a10a22f378 /src/quicktemplates2/qquickdrawer.cpp | |
parent | 8b60bfd13f80588adab2c4778bc8de08832ecb7b (diff) | |
parent | 92032bee2923024d126bc20929f79abd459cae49 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I82c2b8d97d639e24147118a2ca6276ae70195b45
Diffstat (limited to 'src/quicktemplates2/qquickdrawer.cpp')
-rw-r--r-- | src/quicktemplates2/qquickdrawer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 2cc76947..fbc871f7 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -431,8 +431,12 @@ void QQuickDrawer::setPosition(qreal position) d->position = position; if (isComponentComplete()) d->reposition(); - if (d->dimmer) + if (d->dimmer) { d->dimmer->setOpacity(position); + // TODO: check QStyleHints::useHoverEffects in Qt 5.8 + d->dimmer->setAcceptHoverEvents(d->modal && position > 0.0); + // d->dimmer->setAcceptHoverEvents(d->modal && position > 0.0 && QGuiApplication::styleHints()->useHoverEffects()); + } emit positionChanged(); } |