diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
| commit | 2b39081bf101e53a70ff056d527dc3dfb8208bf0 (patch) | |
| tree | a8e57489e18dbdd620b8880eda5c8e2d77049a07 /examples/declarative/righttoleft/layoutdirection/layoutdirection.qml | |
| parent | 5e1112ec04dcef671700e326186ca56b790f7e08 (diff) | |
| parent | c390312f8fbea14ac4df0c5185ca814054f448d8 (diff) | |
| download | Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.zip Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.gz Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
Diffstat (limited to 'examples/declarative/righttoleft/layoutdirection/layoutdirection.qml')
| -rw-r--r-- | examples/declarative/righttoleft/layoutdirection/layoutdirection.qml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml index 3044430..fa343b9 100644 --- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml +++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml @@ -226,7 +226,17 @@ Rectangle { Component { id: viewDelegate Item { - width: (listView.effectiveLayoutDirection == Qt.LeftToRight ? (index == 48 - 1) : (index == 0)) ? 40 : 50 + function effectiveLayoutDirection() { + if (LayoutMirroring.enabled) + if (listView.layoutDirection == Qt.LeftToRight) + return Qt.RightToLeft; + else + return Qt.LeftToRight; + else + return listView.layoutDirection; + } + + width: (effectiveLayoutDirection() == Qt.LeftToRight ? (index == 48 - 1) : (index == 0)) ? 40 : 50 Rectangle { width: 40; height: 40 color: Qt.rgba(0.5+(48 - index)*Math.random()/48, |