diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-12 18:11:06 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 11:39:17 +0200 |
commit | 698702bb9dda6f440b0da0735d2c6d882066f05a (patch) | |
tree | 11e837858f012f0fa0c7b5b115664674e9d64519 | |
parent | 3db4aa27685d61cd190815126700397fb9b28cda (diff) |
QQuickDwm: use QtWin::WindowFlip3DPolicy
Change-Id: Ifa74acbf7cde330838b37505e18a5b7376116216
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
-rw-r--r-- | examples/winextras/quickdwm/quickdwm.qml | 2 | ||||
-rw-r--r-- | src/imports/winextras/plugin.cpp | 1 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures.cpp | 22 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures_p.h | 14 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures_p_p.h | 2 |
5 files changed, 14 insertions, 27 deletions
diff --git a/examples/winextras/quickdwm/quickdwm.qml b/examples/winextras/quickdwm/quickdwm.qml index 925e05b..e983790 100644 --- a/examples/winextras/quickdwm/quickdwm.qml +++ b/examples/winextras/quickdwm/quickdwm.qml @@ -52,7 +52,7 @@ Rectangle { id: dwmfeatures bottomGlassMargin: compositionEnabled ? 30 : 0 excludedFromPeek: true - flip3DPolicy: DwmFeatures.FlipExcludeAbove + flip3DPolicy: QtWin.FlipExcludeAbove } Window { diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index 348ee4d..6424477 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -59,6 +59,7 @@ public: void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); + qmlRegisterUncreatableType<QtWin>(uri, 1, 0, "QtWin", "Cannot create an instance of the QtWin namespace."); qmlRegisterType<QQuickDwmFeatures>(uri, 1, 0, "DwmFeatures"); qmlRegisterType<QQuickTaskbarButton>(uri, 1, 0, "TaskbarButton"); qmlRegisterUncreatableType<QWinTaskbarProgress>(uri, 1, 0, "TaskbarProgress", "Cannot create TaskbarProgress - use TaskbarButton.progress instead."); diff --git a/src/imports/winextras/qquickdwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp index 3fb77ea..73d800e 100644 --- a/src/imports/winextras/qquickdwmfeatures.cpp +++ b/src/imports/winextras/qquickdwmfeatures.cpp @@ -245,26 +245,20 @@ void QQuickDwmFeatures::setPeekDisallowed(bool disallow) } /*! - \enum QQuickDwmFeatures::Flip3DPolicy - - See QtWin::WindowFlip3DPolicy. - */ - -/*! - \qmlproperty DwmFeatures::Flip3DPolicy DwmFeatures::flip3DPolicy + \qmlproperty QtWin::WindowFlip3DPolicy DwmFeatures::flip3DPolicy The current Flip3D policy for the window. */ -QQuickDwmFeatures::Flip3DPolicy QQuickDwmFeatures::flip3DPolicy() const +QtWin::WindowFlip3DPolicy QQuickDwmFeatures::flip3DPolicy() const { Q_D(const QQuickDwmFeatures); if (window()) - return static_cast<Flip3DPolicy>(QtWin::windowFlip3DPolicy(window())); + return QtWin::windowFlip3DPolicy(window()); else - return static_cast<Flip3DPolicy>(d->flipPolicy); + return d->flipPolicy; } -void QQuickDwmFeatures::setFlip3DPolicy(QQuickDwmFeatures::Flip3DPolicy policy) +void QQuickDwmFeatures::setFlip3DPolicy(QtWin::WindowFlip3DPolicy policy) { Q_D(QQuickDwmFeatures); if (d->flipPolicy == policy) @@ -314,7 +308,7 @@ void QQuickDwmFeatures::itemChange(QQuickItem::ItemChange change, const QQuickIt QQuickDwmFeaturesPrivate::QQuickDwmFeaturesPrivate(QQuickDwmFeatures *parent) : topMargin(0), rightMargin(0), bottomMargin(0), leftMargin(0), - peekDisallowed(false), peekExcluded(false), flipPolicy(QQuickDwmFeatures::FlipDefault), + peekDisallowed(false), peekExcluded(false), flipPolicy(QtWin::FlipDefault), q_ptr(parent), formatSet(false) { } @@ -335,8 +329,8 @@ void QQuickDwmFeaturesPrivate::update() QtWin::setWindowExcludedFromPeek(w, peekExcluded); if (peekDisallowed) QtWin::setWindowDisallowPeek(w, peekDisallowed); - if (flipPolicy != QQuickDwmFeatures::FlipDefault) - QtWin::setWindowFlip3DPolicy(w, static_cast<QtWin::WindowFlip3DPolicy>(flipPolicy)); + if (flipPolicy != QtWin::FlipDefault) + QtWin::setWindowFlip3DPolicy(w, flipPolicy); if (topMargin || rightMargin || bottomMargin || leftMargin) QtWin::extendFrameIntoClientArea(w, leftMargin, topMargin, rightMargin, bottomMargin); } diff --git a/src/imports/winextras/qquickdwmfeatures_p.h b/src/imports/winextras/qquickdwmfeatures_p.h index 50403e6..1b58142 100644 --- a/src/imports/winextras/qquickdwmfeatures_p.h +++ b/src/imports/winextras/qquickdwmfeatures_p.h @@ -63,17 +63,9 @@ class QQuickDwmFeatures : public QQuickItem Q_PROPERTY(int leftGlassMargin READ leftGlassMargin WRITE setLeftGlassMargin NOTIFY leftGlassMarginChanged) Q_PROPERTY(bool excludedFromPeek READ isExcludedFromPeek WRITE setExcludedFromPeek NOTIFY excludedFromPeekChanged) Q_PROPERTY(bool peekDisallowed READ isPeekDisallowed WRITE setPeekDisallowed NOTIFY peekDisallowedChanged) - Q_PROPERTY(Flip3DPolicy flip3DPolicy READ flip3DPolicy WRITE setFlip3DPolicy NOTIFY flip3DPolicyChanged) - Q_ENUMS(Flip3DPolicy) + Q_PROPERTY(QtWin::WindowFlip3DPolicy flip3DPolicy READ flip3DPolicy WRITE setFlip3DPolicy NOTIFY flip3DPolicyChanged) public: - enum Flip3DPolicy // keep sync with QtWin::WindowFlip3DPolicy - { - FlipDefault, - FlipExcludeBelow, - FlipExcludeAbove - }; - explicit QQuickDwmFeatures(QQuickItem *parent = 0); ~QQuickDwmFeatures(); @@ -96,8 +88,8 @@ public: void setExcludedFromPeek(bool exclude); bool isPeekDisallowed() const; void setPeekDisallowed(bool disallow); - Flip3DPolicy flip3DPolicy() const; - void setFlip3DPolicy(Flip3DPolicy policy); + QtWin::WindowFlip3DPolicy flip3DPolicy() const; + void setFlip3DPolicy(QtWin::WindowFlip3DPolicy policy); bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; diff --git a/src/imports/winextras/qquickdwmfeatures_p_p.h b/src/imports/winextras/qquickdwmfeatures_p_p.h index 2f794db..d371844 100644 --- a/src/imports/winextras/qquickdwmfeatures_p_p.h +++ b/src/imports/winextras/qquickdwmfeatures_p_p.h @@ -58,7 +58,7 @@ public: bool peekDisallowed; bool peekExcluded; - QQuickDwmFeatures::Flip3DPolicy flipPolicy; + QtWin::WindowFlip3DPolicy flipPolicy; void update(); |