diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-05-22 12:55:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-05-22 18:34:42 +0000 |
| commit | 7d39b4ff7d555f4731aa235ecb286efc43535cb7 (patch) | |
| tree | e3943fbaf44a6602f5ab7aaeec05376e3d40b81a /src/controls/qquickcheckable.cpp | |
| parent | a3b1db8586cc10da12314cf21a0a377b50874703 (diff) | |
Promote layoutDirection & effectiveLayoutDirection to Control
Change-Id: I44df09c17d6d20cfd929af4e331e15f48b19587e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickcheckable.cpp')
| -rw-r--r-- | src/controls/qquickcheckable.cpp | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/src/controls/qquickcheckable.cpp b/src/controls/qquickcheckable.cpp index c5526c0b..24abb5f9 100644 --- a/src/controls/qquickcheckable.cpp +++ b/src/controls/qquickcheckable.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE */ QQuickCheckablePrivate::QQuickCheckablePrivate() : - checked(false), exclusive(false), indicator(Q_NULLPTR), layoutDirection(Qt::LeftToRight) + checked(false), exclusive(false), indicator(Q_NULLPTR) { } @@ -122,40 +122,6 @@ void QQuickCheckable::setIndicator(QQuickItem *indicator) } /*! - \qmlproperty enumeration QtQuickControls2::Checkable::layoutDirection - - TODO -*/ -Qt::LayoutDirection QQuickCheckable::layoutDirection() const -{ - Q_D(const QQuickCheckable); - return d->layoutDirection; -} - -/*! - \qmlproperty enumeration QtQuickControls2::Checkable::effectiveLayoutDirection - - TODO -*/ -Qt::LayoutDirection QQuickCheckable::effectiveLayoutDirection() const -{ - Q_D(const QQuickCheckable); - if (isMirrored()) - return d->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft; - return d->layoutDirection; -} - -void QQuickCheckable::setLayoutDirection(Qt::LayoutDirection direction) -{ - Q_D(QQuickCheckable); - if (d->layoutDirection != direction) { - d->layoutDirection = direction; - emit layoutDirectionChanged(); - emit effectiveLayoutDirectionChanged(); - } -} - -/*! \qmlmethod void QtQuickControls2::Checkable::toggle() TODO @@ -182,9 +148,4 @@ void QQuickCheckable::mouseReleaseEvent(QMouseEvent *event) setChecked(d->exclusive || !d->checked); } -void QQuickCheckable::mirrorChange() -{ - emit effectiveLayoutDirectionChanged(); -} - QT_END_NAMESPACE |