Merge lp:~zsombi/ubuntu-ui-toolkit/layouts-visibility into lp:ubuntu-ui-toolkit/staging
- layouts-visibility
- Merge into staging
Proposed by
Zsombor Egri
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Cris Dywan | ||||||||||||
| Approved revision: | 1055 | ||||||||||||
| Merged at revision: | 1065 | ||||||||||||
| Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/layouts-visibility | ||||||||||||
| Merge into: | lp:ubuntu-ui-toolkit/staging | ||||||||||||
| Diff against target: |
1516 lines (+595/-227) 12 files modified
components.api (+2/-0) modules/Ubuntu/Layouts/plugin/plugin.pro (+1/-1) modules/Ubuntu/Layouts/plugin/propertychanges.cpp (+18/-33) modules/Ubuntu/Layouts/plugin/propertychanges_p.h (+3/-16) modules/Ubuntu/Layouts/plugin/ulitemlayout.h (+4/-1) modules/Ubuntu/Layouts/plugin/ullayouts.cpp (+92/-81) modules/Ubuntu/Layouts/plugin/ullayouts.h (+8/-3) modules/Ubuntu/Layouts/plugin/ullayouts_p.h (+3/-5) tests/unit_x11/tst_layouts/NestedVisibility.qml (+163/-0) tests/unit_x11/tst_layouts/Visibility.qml (+84/-0) tests/unit_x11/tst_layouts/tst_layouts.cpp (+214/-86) tests/unit_x11/tst_layouts/tst_layouts.pro (+3/-1) |
||||||||||||
| To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/layouts-visibility | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Ubuntu Layouts reparents those default layout components which are not subject of layout instead of altering their visible and enabled properties.
Description of the change
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1042
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Cris Dywan (kalikiana) wrote : | # |
The test case should
- check that visible is not changed, ie. bug 1300668
- verify ordering of the components
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1043
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1052
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
- 1053. By Zsombor Egri
-
test cases merged
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1053
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Cris Dywan (kalikiana) wrote : | # |
Thanks for the change to data!
992 QTest::
This should probably be "landscape"
Aside from that it's looking good.
review:
Needs Fixing
- 1054. By Zsombor Egri
-
test tag fixed
- 1055. By Zsombor Egri
-
staging merge
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1055
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'components.api' | |||
| 2 | --- components.api 2014-05-15 09:41:46 +0000 | |||
| 3 | +++ components.api 2014-05-20 19:37:09 +0000 | |||
| 4 | @@ -868,6 +868,8 @@ | |||
| 5 | 868 | exports: ["Layouts 0.1", "Layouts 1.0"] | 868 | exports: ["Layouts 0.1", "Layouts 1.0"] |
| 6 | 869 | Property { name: "currentLayout"; type: "string"; isReadonly: true } | 869 | Property { name: "currentLayout"; type: "string"; isReadonly: true } |
| 7 | 870 | Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true } | 870 | Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true } |
| 8 | 871 | Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } | ||
| 9 | 872 | Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true } | ||
| 10 | 871 | name: "ULLayoutsAttached" | 873 | name: "ULLayoutsAttached" |
| 11 | 872 | prototype: "QObject" | 874 | prototype: "QObject" |
| 12 | 873 | Property { name: "item"; type: "string" } | 875 | Property { name: "item"; type: "string" } |
| 13 | 874 | 876 | ||
| 14 | === modified file 'modules/Ubuntu/Layouts/plugin/plugin.pro' | |||
| 15 | --- modules/Ubuntu/Layouts/plugin/plugin.pro 2013-11-22 11:15:48 +0000 | |||
| 16 | +++ modules/Ubuntu/Layouts/plugin/plugin.pro 2014-05-20 19:37:09 +0000 | |||
| 17 | @@ -5,7 +5,7 @@ | |||
| 18 | 5 | 5 | ||
| 19 | 6 | QMAKE_CXXFLAGS += -Werror | 6 | QMAKE_CXXFLAGS += -Werror |
| 20 | 7 | 7 | ||
| 22 | 8 | QT += quick-private | 8 | QT += quick-private gui-private |
| 23 | 9 | QT += qml-private core-private | 9 | QT += qml-private core-private |
| 24 | 10 | 10 | ||
| 25 | 11 | equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { | 11 | equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { |
| 26 | 12 | 12 | ||
| 27 | === modified file 'modules/Ubuntu/Layouts/plugin/propertychanges.cpp' | |||
| 28 | --- modules/Ubuntu/Layouts/plugin/propertychanges.cpp 2013-06-26 09:58:41 +0000 | |||
| 29 | +++ modules/Ubuntu/Layouts/plugin/propertychanges.cpp 2014-05-20 19:37:09 +0000 | |||
| 30 | @@ -145,7 +145,7 @@ | |||
| 31 | 145 | } | 145 | } |
| 32 | 146 | if (fromBinding) { | 146 | if (fromBinding) { |
| 33 | 147 | QQmlAbstractBinding *revertedBinding = QQmlPropertyPrivate::setBinding(property, fromBinding); | 147 | QQmlAbstractBinding *revertedBinding = QQmlPropertyPrivate::setBinding(property, fromBinding); |
| 35 | 148 | if (revertedBinding && ((revertedBinding != toBinding.data()) || (revertedBinding == toBinding.data() && deleteToBinding))) { | 148 | if (revertedBinding && (revertedBinding != fromBinding) && ((revertedBinding != toBinding.data()) || (revertedBinding == toBinding.data() && deleteToBinding))) { |
| 36 | 149 | revertedBinding->destroy(); | 149 | revertedBinding->destroy(); |
| 37 | 150 | } | 150 | } |
| 38 | 151 | } else if (!toBinding.isNull() && QQmlPropertyPrivate::binding(property) == toBinding.data()) { | 151 | } else if (!toBinding.isNull() && QQmlPropertyPrivate::binding(property) == toBinding.data()) { |
| 39 | @@ -222,24 +222,6 @@ | |||
| 40 | 222 | { | 222 | { |
| 41 | 223 | } | 223 | } |
| 42 | 224 | 224 | ||
| 43 | 225 | /****************************************************************************** | ||
| 44 | 226 | * ReparentChange | ||
| 45 | 227 | */ | ||
| 46 | 228 | ReparentChange::ReparentChange(QQuickItem *target, const QString &property, QQuickItem *source) | ||
| 47 | 229 | : PropertyChange(target, property, QVariant(), Normal) | ||
| 48 | 230 | , sourceProperty(source, property, qmlContext(source)) | ||
| 49 | 231 | { | ||
| 50 | 232 | action.type = PropertyAction::Binding; | ||
| 51 | 233 | } | ||
| 52 | 234 | |||
| 53 | 235 | void ReparentChange::saveState() | ||
| 54 | 236 | { | ||
| 55 | 237 | action.toValue = sourceProperty.read(); | ||
| 56 | 238 | PropertyChange::saveState(); | ||
| 57 | 239 | if (sourceProperty.isValid()) { | ||
| 58 | 240 | action.setTargetBinding(QQmlPropertyPrivate::binding(sourceProperty), false); | ||
| 59 | 241 | } | ||
| 60 | 242 | } | ||
| 61 | 243 | 225 | ||
| 62 | 244 | /****************************************************************************** | 226 | /****************************************************************************** |
| 63 | 245 | * ParentChange | 227 | * ParentChange |
| 64 | @@ -304,35 +286,31 @@ | |||
| 65 | 304 | * ItemStackBackup | 286 | * ItemStackBackup |
| 66 | 305 | * High priority change backing up the item's stack position. | 287 | * High priority change backing up the item's stack position. |
| 67 | 306 | */ | 288 | */ |
| 69 | 307 | ItemStackBackup::ItemStackBackup(QQuickItem *item, QQuickItem *currentLayoutItem, QQuickItem *previousLayoutItem) | 289 | ItemStackBackup::ItemStackBackup(QQuickItem *item) |
| 70 | 308 | : PropertyChange(High) | 290 | : PropertyChange(High) |
| 71 | 309 | , target(item) | 291 | , target(item) |
| 75 | 310 | , currentLayout(currentLayoutItem) | 292 | , prevItem(0) |
| 73 | 311 | , previousLayout(previousLayoutItem) | ||
| 74 | 312 | , originalStackBefore(0) | ||
| 76 | 313 | { | 293 | { |
| 77 | 314 | } | 294 | } |
| 78 | 315 | 295 | ||
| 79 | 316 | void ItemStackBackup::saveState() | 296 | void ItemStackBackup::saveState() |
| 80 | 317 | { | 297 | { |
| 81 | 318 | QQuickItem *rewindParent = target->parentItem(); | 298 | QQuickItem *rewindParent = target->parentItem(); |
| 82 | 299 | if (!rewindParent) { | ||
| 83 | 300 | return; | ||
| 84 | 301 | } | ||
| 85 | 319 | // save original stack position, but detect layout objects! | 302 | // save original stack position, but detect layout objects! |
| 86 | 320 | QList<QQuickItem*> children = rewindParent->childItems(); | 303 | QList<QQuickItem*> children = rewindParent->childItems(); |
| 95 | 321 | for (int ii = 0; ii < children.count() - 1; ++ii) { | 304 | int index = children.indexOf(target); |
| 96 | 322 | if (children.at(ii) == target) { | 305 | if (index > 0) { |
| 97 | 323 | originalStackBefore = children.at(ii + 1); | 306 | prevItem = children.at(index - 1); |
| 90 | 324 | if (originalStackBefore == currentLayout || originalStackBefore == previousLayout) { | ||
| 91 | 325 | originalStackBefore = 0; | ||
| 92 | 326 | } | ||
| 93 | 327 | break; | ||
| 94 | 328 | } | ||
| 98 | 329 | } | 307 | } |
| 99 | 330 | } | 308 | } |
| 100 | 331 | 309 | ||
| 101 | 332 | void ItemStackBackup::revert() | 310 | void ItemStackBackup::revert() |
| 102 | 333 | { | 311 | { |
| 105 | 334 | if (originalStackBefore) { | 312 | if (prevItem) { |
| 106 | 335 | target->stackBefore(originalStackBefore); | 313 | target->stackAfter(prevItem); |
| 107 | 336 | } | 314 | } |
| 108 | 337 | } | 315 | } |
| 109 | 338 | 316 | ||
| 110 | @@ -459,6 +437,13 @@ | |||
| 111 | 459 | return *this; | 437 | return *this; |
| 112 | 460 | } | 438 | } |
| 113 | 461 | 439 | ||
| 114 | 440 | // creates two changes, one for reparenting and one for itemstack backup | ||
| 115 | 441 | ChangeList &ChangeList::addParentChange(QQuickItem *item, QQuickItem *newParent, bool topmostItem) | ||
| 116 | 442 | { | ||
| 117 | 443 | return addChange(new ParentChange(item, newParent, topmostItem)) | ||
| 118 | 444 | .addChange(new ItemStackBackup(item)); | ||
| 119 | 445 | } | ||
| 120 | 446 | |||
| 121 | 462 | QList<PropertyChange*> ChangeList::unifiedChanges() | 447 | QList<PropertyChange*> ChangeList::unifiedChanges() |
| 122 | 463 | { | 448 | { |
| 123 | 464 | QList<PropertyChange*> list; | 449 | QList<PropertyChange*> list; |
| 124 | 465 | 450 | ||
| 125 | === modified file 'modules/Ubuntu/Layouts/plugin/propertychanges_p.h' | |||
| 126 | --- modules/Ubuntu/Layouts/plugin/propertychanges_p.h 2013-06-26 09:58:41 +0000 | |||
| 127 | +++ modules/Ubuntu/Layouts/plugin/propertychanges_p.h 2014-05-20 19:37:09 +0000 | |||
| 128 | @@ -104,18 +104,6 @@ | |||
| 129 | 104 | }; | 104 | }; |
| 130 | 105 | 105 | ||
| 131 | 106 | 106 | ||
| 132 | 107 | class ReparentChange : public PropertyChange | ||
| 133 | 108 | { | ||
| 134 | 109 | public: | ||
| 135 | 110 | ReparentChange(QQuickItem *item, const QString &property, QQuickItem *source); | ||
| 136 | 111 | |||
| 137 | 112 | protected: | ||
| 138 | 113 | virtual void saveState(); | ||
| 139 | 114 | |||
| 140 | 115 | QQmlProperty sourceProperty; | ||
| 141 | 116 | }; | ||
| 142 | 117 | |||
| 143 | 118 | |||
| 144 | 119 | class ParentChange : public PropertyChange | 107 | class ParentChange : public PropertyChange |
| 145 | 120 | { | 108 | { |
| 146 | 121 | public: | 109 | public: |
| 147 | @@ -143,16 +131,14 @@ | |||
| 148 | 143 | class ItemStackBackup : public PropertyChange | 131 | class ItemStackBackup : public PropertyChange |
| 149 | 144 | { | 132 | { |
| 150 | 145 | public: | 133 | public: |
| 152 | 146 | ItemStackBackup(QQuickItem *item, QQuickItem *currentLayoutItem, QQuickItem *previousLayoutItem); | 134 | ItemStackBackup(QQuickItem *item); |
| 153 | 147 | void apply() {} | 135 | void apply() {} |
| 154 | 148 | void revert(); | 136 | void revert(); |
| 155 | 149 | 137 | ||
| 156 | 150 | protected: | 138 | protected: |
| 157 | 151 | virtual void saveState(); | 139 | virtual void saveState(); |
| 158 | 152 | QQuickItem *target; | 140 | QQuickItem *target; |
| 162 | 153 | QQuickItem *currentLayout; | 141 | QQuickItem *prevItem; |
| 160 | 154 | QQuickItem *previousLayout; | ||
| 161 | 155 | QQuickItem *originalStackBefore; | ||
| 163 | 156 | private: | 142 | private: |
| 164 | 157 | friend class ULLayouts; | 143 | friend class ULLayouts; |
| 165 | 158 | }; | 144 | }; |
| 166 | @@ -214,6 +200,7 @@ | |||
| 167 | 214 | void clear(); | 200 | void clear(); |
| 168 | 215 | 201 | ||
| 169 | 216 | ChangeList &addChange(PropertyChange *change); | 202 | ChangeList &addChange(PropertyChange *change); |
| 170 | 203 | ChangeList &addParentChange(QQuickItem *item, QQuickItem *newParent, bool topmostItem); | ||
| 171 | 217 | 204 | ||
| 172 | 218 | private: | 205 | private: |
| 173 | 219 | QList<PropertyChange*> changes[PropertyChange::MaxPriority]; | 206 | QList<PropertyChange*> changes[PropertyChange::MaxPriority]; |
| 174 | 220 | 207 | ||
| 175 | === modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.h' | |||
| 176 | --- modules/Ubuntu/Layouts/plugin/ulitemlayout.h 2013-06-06 16:00:10 +0000 | |||
| 177 | +++ modules/Ubuntu/Layouts/plugin/ulitemlayout.h 2014-05-20 19:37:09 +0000 | |||
| 178 | @@ -26,7 +26,7 @@ | |||
| 179 | 26 | Q_OBJECT | 26 | Q_OBJECT |
| 180 | 27 | Q_DISABLE_COPY(ULItemLayout) | 27 | Q_DISABLE_COPY(ULItemLayout) |
| 181 | 28 | 28 | ||
| 183 | 29 | Q_PROPERTY(QString item READ item WRITE setItem) | 29 | Q_PROPERTY(QString item READ item WRITE setItem NOTIFY itemChanged) |
| 184 | 30 | 30 | ||
| 185 | 31 | public: | 31 | public: |
| 186 | 32 | explicit ULItemLayout(QQuickItem *parent = 0); | 32 | explicit ULItemLayout(QQuickItem *parent = 0); |
| 187 | @@ -35,6 +35,9 @@ | |||
| 188 | 35 | QString item() const; | 35 | QString item() const; |
| 189 | 36 | void setItem(const QString &value); | 36 | void setItem(const QString &value); |
| 190 | 37 | 37 | ||
| 191 | 38 | Q_SIGNALS: | ||
| 192 | 39 | void itemChanged(); | ||
| 193 | 40 | |||
| 194 | 38 | private: | 41 | private: |
| 195 | 39 | QString m_itemName; | 42 | QString m_itemName; |
| 196 | 40 | }; | 43 | }; |
| 197 | 41 | 44 | ||
| 198 | === modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.cpp' | |||
| 199 | --- modules/Ubuntu/Layouts/plugin/ullayouts.cpp 2014-04-20 19:25:12 +0000 | |||
| 200 | +++ modules/Ubuntu/Layouts/plugin/ullayouts.cpp 2014-05-20 19:37:09 +0000 | |||
| 201 | @@ -22,15 +22,21 @@ | |||
| 202 | 22 | #include "ulconditionallayout.h" | 22 | #include "ulconditionallayout.h" |
| 203 | 23 | #include "propertychanges_p.h" | 23 | #include "propertychanges_p.h" |
| 204 | 24 | #include <QtQml/QQmlInfo> | 24 | #include <QtQml/QQmlInfo> |
| 205 | 25 | #include <QtQuick/private/qquickitem_p.h> | ||
| 206 | 25 | 26 | ||
| 207 | 26 | ULLayoutsPrivate::ULLayoutsPrivate(ULLayouts *qq) | 27 | ULLayoutsPrivate::ULLayoutsPrivate(ULLayouts *qq) |
| 208 | 27 | : QQmlIncubator(Asynchronous) | 28 | : QQmlIncubator(Asynchronous) |
| 209 | 28 | , q_ptr(qq) | 29 | , q_ptr(qq) |
| 210 | 29 | , currentLayoutItem(0) | 30 | , currentLayoutItem(0) |
| 211 | 30 | , previousLayoutItem(0) | 31 | , previousLayoutItem(0) |
| 212 | 32 | , contentItem(new QQuickItem) | ||
| 213 | 31 | , currentLayoutIndex(-1) | 33 | , currentLayoutIndex(-1) |
| 214 | 32 | , ready(false) | 34 | , ready(false) |
| 215 | 33 | { | 35 | { |
| 216 | 36 | // hidden container for the components that are not laid out | ||
| 217 | 37 | // any component not subject of layout is reparented into this component | ||
| 218 | 38 | contentItem->setParent(qq); | ||
| 219 | 39 | contentItem->setParentItem(qq); | ||
| 220 | 34 | } | 40 | } |
| 221 | 35 | 41 | ||
| 222 | 36 | 42 | ||
| 223 | @@ -80,7 +86,6 @@ | |||
| 224 | 80 | QQuickItem *item = static_cast<QQuickItem*>(object); | 86 | QQuickItem *item = static_cast<QQuickItem*>(object); |
| 225 | 81 | // set disabled and invisible, and set its parent as last action | 87 | // set disabled and invisible, and set its parent as last action |
| 226 | 82 | item->setVisible(false); | 88 | item->setVisible(false); |
| 227 | 83 | item->setEnabled(false); | ||
| 228 | 84 | } | 89 | } |
| 229 | 85 | 90 | ||
| 230 | 86 | /* | 91 | /* |
| 231 | @@ -98,14 +103,16 @@ | |||
| 232 | 98 | currentLayoutItem = qobject_cast<QQuickItem*>(object()); | 103 | currentLayoutItem = qobject_cast<QQuickItem*>(object()); |
| 233 | 99 | Q_ASSERT(currentLayoutItem); | 104 | Q_ASSERT(currentLayoutItem); |
| 234 | 100 | 105 | ||
| 235 | 101 | // hide all non-laid out items first | ||
| 236 | 102 | hideExcludedItems(); | ||
| 237 | 103 | |||
| 238 | 104 | //reparent components to be laid out | 106 | //reparent components to be laid out |
| 239 | 105 | reparentItems(); | 107 | reparentItems(); |
| 240 | 106 | // set parent item, then enable and show layout | 108 | // set parent item, then enable and show layout |
| 241 | 107 | changes.addChange(new ParentChange(currentLayoutItem, q, false)); | 109 | changes.addChange(new ParentChange(currentLayoutItem, q, false)); |
| 243 | 108 | itemActivate(currentLayoutItem, true); | 110 | |
| 244 | 111 | // hide default layout, then show the new one | ||
| 245 | 112 | // there's no need to queue these property changes as we do not need | ||
| 246 | 113 | // to back up their previosus states | ||
| 247 | 114 | contentItem->setVisible(false); | ||
| 248 | 115 | currentLayoutItem->setVisible(true); | ||
| 249 | 109 | // apply changes | 116 | // apply changes |
| 250 | 110 | changes.apply(); | 117 | changes.apply(); |
| 251 | 111 | // clear previous layout | 118 | // clear previous layout |
| 252 | @@ -114,18 +121,10 @@ | |||
| 253 | 114 | 121 | ||
| 254 | 115 | Q_EMIT q->currentLayoutChanged(); | 122 | Q_EMIT q->currentLayoutChanged(); |
| 255 | 116 | } else if (status == Error) { | 123 | } else if (status == Error) { |
| 256 | 117 | Q_Q(ULLayouts); | ||
| 257 | 118 | error(q, errors()); | 124 | error(q, errors()); |
| 258 | 119 | } | 125 | } |
| 259 | 120 | } | 126 | } |
| 260 | 121 | 127 | ||
| 261 | 122 | void ULLayoutsPrivate::hideExcludedItems() | ||
| 262 | 123 | { | ||
| 263 | 124 | for (int i = 0; i < excludedFromLayout.count(); i++) { | ||
| 264 | 125 | itemActivate(excludedFromLayout[i], false); | ||
| 265 | 126 | } | ||
| 266 | 127 | } | ||
| 267 | 128 | |||
| 268 | 129 | /* | 128 | /* |
| 269 | 130 | * Re-parent items to the new layout. | 129 | * Re-parent items to the new layout. |
| 270 | 131 | */ | 130 | */ |
| 271 | @@ -134,26 +133,32 @@ | |||
| 272 | 134 | // create copy of items list, to keep track of which ones we change | 133 | // create copy of items list, to keep track of which ones we change |
| 273 | 135 | LaidOutItemsMap unusedItems = itemsToLayout; | 134 | LaidOutItemsMap unusedItems = itemsToLayout; |
| 274 | 136 | 135 | ||
| 286 | 137 | // iterate through the Layout definition to find containers - those Items with | 136 | // iterate through the Layout definition to find containers - ItemLayout items |
| 287 | 138 | // ConditionalLayout.items set | 137 | QList<ULItemLayout*> containers = collectContainers(currentLayoutItem); |
| 288 | 139 | QList<QQuickItem*> items = currentLayoutItem->findChildren<QQuickItem*>(); | 138 | |
| 289 | 140 | // add the root item as that also can be the container | 139 | Q_FOREACH(ULItemLayout *container, containers) { |
| 290 | 141 | items.prepend(currentLayoutItem); | 140 | reparentToItemLayout(unusedItems, container); |
| 291 | 142 | 141 | } | |
| 292 | 143 | Q_FOREACH(QQuickItem *container, items) { | 142 | } |
| 293 | 144 | // check whether we have ItemLayout declared | 143 | |
| 294 | 145 | ULItemLayout *itemLayout = qobject_cast<ULItemLayout*>(container); | 144 | QList<ULItemLayout*> ULLayoutsPrivate::collectContainers(QQuickItem *fromItem) |
| 295 | 146 | if (itemLayout) { | 145 | { |
| 296 | 147 | reparentToItemLayout(unusedItems, itemLayout); | 146 | QList<ULItemLayout*> result; |
| 297 | 147 | // check first if the fromItem is also a container | ||
| 298 | 148 | ULItemLayout *container = qobject_cast<ULItemLayout*>(fromItem); | ||
| 299 | 149 | if (container) { | ||
| 300 | 150 | result.append(container); | ||
| 301 | 151 | } | ||
| 302 | 152 | |||
| 303 | 153 | // loop through children but exclude nested Layouts | ||
| 304 | 154 | QList<QQuickItem*> children = fromItem->childItems(); | ||
| 305 | 155 | Q_FOREACH(QQuickItem *child, children) { | ||
| 306 | 156 | if (qobject_cast<ULLayouts*>(child)) { | ||
| 307 | 157 | continue; | ||
| 308 | 148 | } | 158 | } |
| 317 | 149 | } | 159 | result.append(collectContainers(child)); |
| 318 | 150 | 160 | } | |
| 319 | 151 | // hide the rest of the unused ones | 161 | return result; |
| 312 | 152 | LaidOutItemsMapIterator i(unusedItems); | ||
| 313 | 153 | while (i.hasNext()) { | ||
| 314 | 154 | i.next(); | ||
| 315 | 155 | itemActivate(i.value(), false); | ||
| 316 | 156 | } | ||
| 320 | 157 | } | 162 | } |
| 321 | 158 | 163 | ||
| 322 | 159 | /* | 164 | /* |
| 323 | @@ -176,8 +181,7 @@ | |||
| 324 | 176 | } | 181 | } |
| 325 | 177 | 182 | ||
| 326 | 178 | // the component fills the parent | 183 | // the component fills the parent |
| 329 | 179 | changes.addChange(new ParentChange(item, fragment, true)); | 184 | changes.addParentChange(item, fragment, true); |
| 328 | 180 | changes.addChange(new ItemStackBackup(item, currentLayoutItem, previousLayoutItem)); | ||
| 330 | 181 | changes.addChange(new AnchorChange(item, "fill", fragment)); | 185 | changes.addChange(new AnchorChange(item, "fill", fragment)); |
| 331 | 182 | changes.addChange(new PropertyChange(item, "anchors.margins", 0)); | 186 | changes.addChange(new PropertyChange(item, "anchors.margins", 0)); |
| 332 | 183 | changes.addChange(new PropertyChange(item, "anchors.leftMargin", 0)); | 187 | changes.addChange(new PropertyChange(item, "anchors.leftMargin", 0)); |
| 333 | @@ -194,18 +198,6 @@ | |||
| 334 | 194 | map.remove(itemName); | 198 | map.remove(itemName); |
| 335 | 195 | } | 199 | } |
| 336 | 196 | 200 | ||
| 337 | 197 | void ULLayoutsPrivate::itemActivate(QQuickItem *item, bool activate) | ||
| 338 | 198 | { | ||
| 339 | 199 | changes.addChange(new PropertyChange(item, "visible", activate)) | ||
| 340 | 200 | .addChange(new PropertyChange(item, "enabled", activate)); | ||
| 341 | 201 | } | ||
| 342 | 202 | |||
| 343 | 203 | // remove the deleted item from the excluded ones | ||
| 344 | 204 | void ULLayoutsPrivate::_q_removeExcludedItem(QObject *excludedItem) | ||
| 345 | 205 | { | ||
| 346 | 206 | excludedFromLayout.removeAll(static_cast<QQuickItem*>(excludedItem)); | ||
| 347 | 207 | } | ||
| 348 | 208 | |||
| 349 | 209 | /* | 201 | /* |
| 350 | 210 | * Validates the declared conditional layouts by checking whether they have name | 202 | * Validates the declared conditional layouts by checking whether they have name |
| 351 | 211 | * property set and whether the value set is unique, and whether the conditional | 203 | * property set and whether the value set is unique, and whether the conditional |
| 352 | @@ -244,44 +236,20 @@ | |||
| 353 | 244 | /* | 236 | /* |
| 354 | 245 | * Collect items to be laid out. | 237 | * Collect items to be laid out. |
| 355 | 246 | */ | 238 | */ |
| 357 | 247 | void ULLayoutsPrivate::getLaidOutItems() | 239 | void ULLayoutsPrivate::getLaidOutItems(QQuickItem *container) |
| 358 | 248 | { | 240 | { |
| 364 | 249 | Q_Q(ULLayouts); | 241 | Q_FOREACH(QQuickItem *child, container->childItems()) { |
| 365 | 250 | 242 | // skip nested layouts | |
| 366 | 251 | QList<QQuickItem*> items = q->findChildren<QQuickItem*>(); | 243 | if (qobject_cast<ULLayouts*>(child)) { |
| 367 | 252 | for (int i = 0; i < items.count(); i++) { | 244 | continue; |
| 368 | 253 | QQuickItem *item = items[i]; | 245 | } |
| 369 | 254 | ULLayoutsAttached *marker = qobject_cast<ULLayoutsAttached*>( | 246 | ULLayoutsAttached *marker = qobject_cast<ULLayoutsAttached*>( |
| 371 | 255 | qmlAttachedPropertiesObject<ULLayouts>(item, false)); | 247 | qmlAttachedPropertiesObject<ULLayouts>(child, false)); |
| 372 | 256 | if (marker && !marker->item().isEmpty()) { | 248 | if (marker && !marker->item().isEmpty()) { |
| 374 | 257 | itemsToLayout.insert(marker->item(), item); | 249 | itemsToLayout.insert(marker->item(), child); |
| 375 | 258 | } else { | 250 | } else { |
| 402 | 259 | // the item is not marked to be laid out but one of its parents | 251 | // continue to search in between the child's children |
| 403 | 260 | // can be, therefore check | 252 | getLaidOutItems(child); |
| 378 | 261 | // check if the item's parent is included in the layout | ||
| 379 | 262 | QQuickItem *pl = item->parentItem(); | ||
| 380 | 263 | marker = 0; | ||
| 381 | 264 | if (!pl && item->parent()) { | ||
| 382 | 265 | // this may be an item instance assigned to a property | ||
| 383 | 266 | // like "property var anItem: Item {}" | ||
| 384 | 267 | // in which case we must get the parent object of it, not the parent item | ||
| 385 | 268 | pl = qobject_cast<QQuickItem*>(item->parent()); | ||
| 386 | 269 | } | ||
| 387 | 270 | while (pl) { | ||
| 388 | 271 | marker = qobject_cast<ULLayoutsAttached*>( | ||
| 389 | 272 | qmlAttachedPropertiesObject<ULLayouts>(pl, false)); | ||
| 390 | 273 | if (marker && !marker->item().isEmpty()) { | ||
| 391 | 274 | break; | ||
| 392 | 275 | } | ||
| 393 | 276 | pl = pl->parentItem(); | ||
| 394 | 277 | } | ||
| 395 | 278 | if (!marker || (marker && marker->item().isEmpty())) { | ||
| 396 | 279 | // remember theese so we hide them once we switch away from default layout | ||
| 397 | 280 | excludedFromLayout << item; | ||
| 398 | 281 | // and make sure we remove the item from excluded ones in case the item is destroyed | ||
| 399 | 282 | QObject::connect(item, SIGNAL(destroyed(QObject*)), | ||
| 400 | 283 | q, SLOT(_q_removeExcludedItem(QObject*))); | ||
| 401 | 284 | } | ||
| 404 | 285 | } | 253 | } |
| 405 | 286 | } | 254 | } |
| 406 | 287 | } | 255 | } |
| 407 | @@ -344,6 +312,9 @@ | |||
| 408 | 344 | // revert and clear changes | 312 | // revert and clear changes |
| 409 | 345 | changes.revert(); | 313 | changes.revert(); |
| 410 | 346 | changes.clear(); | 314 | changes.clear(); |
| 411 | 315 | // make contentItem visible | ||
| 412 | 316 | |||
| 413 | 317 | contentItem->setVisible(true); | ||
| 414 | 347 | delete currentLayoutItem; | 318 | delete currentLayoutItem; |
| 415 | 348 | currentLayoutItem = 0; | 319 | currentLayoutItem = 0; |
| 416 | 349 | currentLayoutIndex = -1; | 320 | currentLayoutIndex = -1; |
| 417 | @@ -606,10 +577,18 @@ | |||
| 418 | 606 | Q_D(ULLayouts); | 577 | Q_D(ULLayouts); |
| 419 | 607 | d->ready = true; | 578 | d->ready = true; |
| 420 | 608 | d->validateConditionalLayouts(); | 579 | d->validateConditionalLayouts(); |
| 422 | 609 | d->getLaidOutItems(); | 580 | d->getLaidOutItems(d->contentItem); |
| 423 | 610 | d->updateLayout(); | 581 | d->updateLayout(); |
| 424 | 611 | } | 582 | } |
| 425 | 612 | 583 | ||
| 426 | 584 | void ULLayouts::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) | ||
| 427 | 585 | { | ||
| 428 | 586 | Q_D(ULLayouts); | ||
| 429 | 587 | QQuickItem::geometryChanged(newGeometry, oldGeometry); | ||
| 430 | 588 | // simply update the container's width/height to the new width/height | ||
| 431 | 589 | d->contentItem->setSize(newGeometry.size()); | ||
| 432 | 590 | } | ||
| 433 | 591 | |||
| 434 | 613 | /*! | 592 | /*! |
| 435 | 614 | * \qmlproperty string Layouts::currentLayout | 593 | * \qmlproperty string Layouts::currentLayout |
| 436 | 615 | * The property holds the active layout name. The default layout is identified | 594 | * The property holds the active layout name. The default layout is identified |
| 437 | @@ -634,6 +613,17 @@ | |||
| 438 | 634 | } | 613 | } |
| 439 | 635 | 614 | ||
| 440 | 636 | /*! | 615 | /*! |
| 441 | 616 | * \internal | ||
| 442 | 617 | * Returns the contentItem for internal use. | ||
| 443 | 618 | */ | ||
| 444 | 619 | QQuickItem *ULLayouts::contentItem() const | ||
| 445 | 620 | { | ||
| 446 | 621 | Q_D(const ULLayouts); | ||
| 447 | 622 | return d->contentItem; | ||
| 448 | 623 | } | ||
| 449 | 624 | |||
| 450 | 625 | |||
| 451 | 626 | /*! | ||
| 452 | 637 | * \qmlproperty list<ConditionalLayout> Layouts::layouts | 627 | * \qmlproperty list<ConditionalLayout> Layouts::layouts |
| 453 | 638 | * The property holds the list of different ConditionalLayout elements. | 628 | * The property holds the list of different ConditionalLayout elements. |
| 454 | 639 | */ | 629 | */ |
| 455 | @@ -647,4 +637,25 @@ | |||
| 456 | 647 | &ULLayoutsPrivate::clear_layouts); | 637 | &ULLayoutsPrivate::clear_layouts); |
| 457 | 648 | } | 638 | } |
| 458 | 649 | 639 | ||
| 459 | 640 | /*! | ||
| 460 | 641 | * \internal | ||
| 461 | 642 | * Overrides the default data property. | ||
| 462 | 643 | */ | ||
| 463 | 644 | QQmlListProperty<QObject> ULLayouts::data() | ||
| 464 | 645 | { | ||
| 465 | 646 | Q_D(ULLayouts); | ||
| 466 | 647 | return QQuickItemPrivate::get(d->contentItem)->data(); | ||
| 467 | 648 | } | ||
| 468 | 649 | |||
| 469 | 650 | /*! | ||
| 470 | 651 | * \internal | ||
| 471 | 652 | * Overrides the default children property. | ||
| 472 | 653 | */ | ||
| 473 | 654 | QQmlListProperty<QQuickItem> ULLayouts::children() | ||
| 474 | 655 | { | ||
| 475 | 656 | Q_D(ULLayouts); | ||
| 476 | 657 | return QQuickItemPrivate::get(d->contentItem)->children(); | ||
| 477 | 658 | } | ||
| 478 | 659 | |||
| 479 | 660 | |||
| 480 | 650 | #include "moc_ullayouts.cpp" | 661 | #include "moc_ullayouts.cpp" |
| 481 | 651 | 662 | ||
| 482 | === modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.h' | |||
| 483 | --- modules/Ubuntu/Layouts/plugin/ullayouts.h 2014-02-18 13:27:23 +0000 | |||
| 484 | +++ modules/Ubuntu/Layouts/plugin/ullayouts.h 2014-05-20 19:37:09 +0000 | |||
| 485 | @@ -55,7 +55,10 @@ | |||
| 486 | 55 | 55 | ||
| 487 | 56 | Q_PROPERTY(QString currentLayout READ currentLayout NOTIFY currentLayoutChanged DESIGNABLE false) | 56 | Q_PROPERTY(QString currentLayout READ currentLayout NOTIFY currentLayoutChanged DESIGNABLE false) |
| 488 | 57 | Q_PROPERTY(QQmlListProperty<ULConditionalLayout> layouts READ layouts DESIGNABLE false) | 57 | Q_PROPERTY(QQmlListProperty<ULConditionalLayout> layouts READ layouts DESIGNABLE false) |
| 490 | 58 | 58 | ||
| 491 | 59 | Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false) | ||
| 492 | 60 | Q_PROPERTY(QQmlListProperty<QQuickItem> children READ children DESIGNABLE false) | ||
| 493 | 61 | Q_CLASSINFO("DefaultProperty", "data") | ||
| 494 | 59 | public: | 62 | public: |
| 495 | 60 | explicit ULLayouts(QQuickItem *parent = 0); | 63 | explicit ULLayouts(QQuickItem *parent = 0); |
| 496 | 61 | ~ULLayouts(); | 64 | ~ULLayouts(); |
| 497 | @@ -64,21 +67,23 @@ | |||
| 498 | 64 | 67 | ||
| 499 | 65 | QString currentLayout() const; | 68 | QString currentLayout() const; |
| 500 | 66 | QList<ULConditionalLayout*> layoutList(); | 69 | QList<ULConditionalLayout*> layoutList(); |
| 501 | 70 | QQuickItem *contentItem() const; | ||
| 502 | 67 | 71 | ||
| 503 | 68 | Q_SIGNALS: | 72 | Q_SIGNALS: |
| 504 | 69 | void currentLayoutChanged(); | 73 | void currentLayoutChanged(); |
| 505 | 70 | 74 | ||
| 506 | 71 | protected: | 75 | protected: |
| 507 | 72 | void componentComplete(); | 76 | void componentComplete(); |
| 508 | 77 | void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); | ||
| 509 | 73 | 78 | ||
| 510 | 74 | private: | 79 | private: |
| 511 | 75 | QQmlListProperty<ULConditionalLayout> layouts(); | 80 | QQmlListProperty<ULConditionalLayout> layouts(); |
| 512 | 81 | QQmlListProperty<QObject> data(); | ||
| 513 | 82 | QQmlListProperty<QQuickItem> children(); | ||
| 514 | 76 | 83 | ||
| 515 | 77 | friend class ULConditionalLayout; | 84 | friend class ULConditionalLayout; |
| 516 | 78 | Q_DECLARE_PRIVATE(ULLayouts) | 85 | Q_DECLARE_PRIVATE(ULLayouts) |
| 517 | 79 | QScopedPointer<ULLayoutsPrivate> d_ptr; | 86 | QScopedPointer<ULLayoutsPrivate> d_ptr; |
| 518 | 80 | |||
| 519 | 81 | Q_PRIVATE_SLOT(d_func(), void _q_removeExcludedItem(QObject*)) | ||
| 520 | 82 | }; | 87 | }; |
| 521 | 83 | 88 | ||
| 522 | 84 | QML_DECLARE_TYPE(ULLayouts) | 89 | QML_DECLARE_TYPE(ULLayouts) |
| 523 | 85 | 90 | ||
| 524 | === modified file 'modules/Ubuntu/Layouts/plugin/ullayouts_p.h' | |||
| 525 | --- modules/Ubuntu/Layouts/plugin/ullayouts_p.h 2014-02-18 13:27:23 +0000 | |||
| 526 | +++ modules/Ubuntu/Layouts/plugin/ullayouts_p.h 2014-05-20 19:37:09 +0000 | |||
| 527 | @@ -33,9 +33,8 @@ | |||
| 528 | 33 | 33 | ||
| 529 | 34 | ULLayoutsPrivate(ULLayouts *qq); | 34 | ULLayoutsPrivate(ULLayouts *qq); |
| 530 | 35 | 35 | ||
| 531 | 36 | void _q_removeExcludedItem(QObject *excludedItem); | ||
| 532 | 37 | void validateConditionalLayouts(); | 36 | void validateConditionalLayouts(); |
| 534 | 38 | void getLaidOutItems(); | 37 | void getLaidOutItems(QQuickItem *item); |
| 535 | 39 | void updateLayout(); | 38 | void updateLayout(); |
| 536 | 40 | 39 | ||
| 537 | 41 | static void error(QObject *item, const QString &message); | 40 | static void error(QObject *item, const QString &message); |
| 538 | @@ -51,9 +50,9 @@ | |||
| 539 | 51 | QList<ULConditionalLayout*> layouts; | 50 | QList<ULConditionalLayout*> layouts; |
| 540 | 52 | ChangeList changes; | 51 | ChangeList changes; |
| 541 | 53 | LaidOutItemsMap itemsToLayout; | 52 | LaidOutItemsMap itemsToLayout; |
| 542 | 54 | QList<QQuickItem*> excludedFromLayout; | ||
| 543 | 55 | QQuickItem* currentLayoutItem; | 53 | QQuickItem* currentLayoutItem; |
| 544 | 56 | QQuickItem* previousLayoutItem; | 54 | QQuickItem* previousLayoutItem; |
| 545 | 55 | QQuickItem* contentItem; | ||
| 546 | 57 | int currentLayoutIndex; | 56 | int currentLayoutIndex; |
| 547 | 58 | bool ready:1; | 57 | bool ready:1; |
| 548 | 59 | 58 | ||
| 549 | @@ -64,10 +63,9 @@ | |||
| 550 | 64 | static void clear_layouts(QQmlListProperty<ULConditionalLayout>*); | 63 | static void clear_layouts(QQmlListProperty<ULConditionalLayout>*); |
| 551 | 65 | 64 | ||
| 552 | 66 | void reLayout(); | 65 | void reLayout(); |
| 553 | 67 | void hideExcludedItems(); | ||
| 554 | 68 | void reparentItems(); | 66 | void reparentItems(); |
| 555 | 67 | QList<ULItemLayout*> collectContainers(QQuickItem *fromItem); | ||
| 556 | 69 | void reparentToItemLayout(LaidOutItemsMap &map, ULItemLayout *fragment); | 68 | void reparentToItemLayout(LaidOutItemsMap &map, ULItemLayout *fragment); |
| 557 | 70 | void itemActivate(QQuickItem *item, bool activate); | ||
| 558 | 71 | }; | 69 | }; |
| 559 | 72 | 70 | ||
| 560 | 73 | #endif // ULLAYOUTS_P_H | 71 | #endif // ULLAYOUTS_P_H |
| 561 | 74 | 72 | ||
| 562 | === added file 'tests/unit_x11/tst_layouts/NestedVisibility.qml' | |||
| 563 | --- tests/unit_x11/tst_layouts/NestedVisibility.qml 1970-01-01 00:00:00 +0000 | |||
| 564 | +++ tests/unit_x11/tst_layouts/NestedVisibility.qml 2014-05-20 19:37:09 +0000 | |||
| 565 | @@ -0,0 +1,163 @@ | |||
| 566 | 1 | /* | ||
| 567 | 2 | * Copyright 2014 Canonical Ltd. | ||
| 568 | 3 | * | ||
| 569 | 4 | * This program is free software; you can redistribute it and/or modify | ||
| 570 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
| 571 | 6 | * the Free Software Foundation; version 3. | ||
| 572 | 7 | * | ||
| 573 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 574 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 575 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 576 | 11 | * GNU Lesser General Public License for more details. | ||
| 577 | 12 | * | ||
| 578 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 579 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 580 | 15 | */ | ||
| 581 | 16 | |||
| 582 | 17 | import QtQuick 2.0 | ||
| 583 | 18 | import Ubuntu.Components 1.1 | ||
| 584 | 19 | import Ubuntu.Layouts 1.0 | ||
| 585 | 20 | |||
| 586 | 21 | MainView { | ||
| 587 | 22 | id: main | ||
| 588 | 23 | objectName: "mainView" | ||
| 589 | 24 | applicationName: "test-app" | ||
| 590 | 25 | |||
| 591 | 26 | /* | ||
| 592 | 27 | This property enables the application to change orientation | ||
| 593 | 28 | when the device is rotated. The default is false. | ||
| 594 | 29 | */ | ||
| 595 | 30 | automaticOrientation: true // TODO: support wide aspect ratios, esp. on prepareGamePage | ||
| 596 | 31 | |||
| 597 | 32 | width: units.gu(40) | ||
| 598 | 33 | height: units.gu(75) | ||
| 599 | 34 | |||
| 600 | 35 | function phoneLayout() { | ||
| 601 | 36 | width = units.gu(50); | ||
| 602 | 37 | } | ||
| 603 | 38 | function tabletPortraitLayout() { | ||
| 604 | 39 | width = units.gu(70); | ||
| 605 | 40 | } | ||
| 606 | 41 | function tabletLandscapeLayout() { | ||
| 607 | 42 | width = units.gu(100); | ||
| 608 | 43 | } | ||
| 609 | 44 | |||
| 610 | 45 | PageStack { | ||
| 611 | 46 | Component.onCompleted: push(testPage) | ||
| 612 | 47 | |||
| 613 | 48 | Page { | ||
| 614 | 49 | title: i18n.tr("Conditional Layouts with PageStack") | ||
| 615 | 50 | id: testPage | ||
| 616 | 51 | visible: false | ||
| 617 | 52 | |||
| 618 | 53 | Layouts { | ||
| 619 | 54 | id: layouts | ||
| 620 | 55 | objectName: "mainLayout" | ||
| 621 | 56 | width: parent.width | ||
| 622 | 57 | height: parent.height | ||
| 623 | 58 | layouts: [ | ||
| 624 | 59 | ConditionalLayout { | ||
| 625 | 60 | name: "tabletPortrait" | ||
| 626 | 61 | when: main.width > units.gu(50) | ||
| 627 | 62 | Layouts { | ||
| 628 | 63 | anchors.fill: parent | ||
| 629 | 64 | objectName: "nestedLayout" | ||
| 630 | 65 | layouts: [ | ||
| 631 | 66 | ConditionalLayout { | ||
| 632 | 67 | name: "tabletLandscape" | ||
| 633 | 68 | when: main.width > units.gu(70) | ||
| 634 | 69 | Row { | ||
| 635 | 70 | objectName: "tabletLandscape" | ||
| 636 | 71 | anchors.fill: parent | ||
| 637 | 72 | Rectangle { | ||
| 638 | 73 | height: parent.height | ||
| 639 | 74 | color: "white" | ||
| 640 | 75 | width: parent.width / 5 | ||
| 641 | 76 | } | ||
| 642 | 77 | Flow { | ||
| 643 | 78 | spacing: units.gu(2) | ||
| 644 | 79 | ItemLayout { | ||
| 645 | 80 | objectName: "nestedMagentaContainer" | ||
| 646 | 81 | item: "mainMagenta" | ||
| 647 | 82 | width: units.gu(20) | ||
| 648 | 83 | height: width | ||
| 649 | 84 | } | ||
| 650 | 85 | ItemLayout { | ||
| 651 | 86 | objectName: "nestedGreenContainer" | ||
| 652 | 87 | item: "mainGreen" | ||
| 653 | 88 | width: units.gu(60) | ||
| 654 | 89 | height: width | ||
| 655 | 90 | } | ||
| 656 | 91 | } | ||
| 657 | 92 | } | ||
| 658 | 93 | } | ||
| 659 | 94 | ] | ||
| 660 | 95 | // Default layout, but can have ItemLayouts | ||
| 661 | 96 | // as those will belong to the previous Layouts | ||
| 662 | 97 | // and attaching Layouts.item we can layout it further | ||
| 663 | 98 | Flow { | ||
| 664 | 99 | objectName: "tabletPortrait" | ||
| 665 | 100 | anchors.fill: parent | ||
| 666 | 101 | ItemLayout { | ||
| 667 | 102 | objectName: "greenContainer" | ||
| 668 | 103 | item: "mainGreen" | ||
| 669 | 104 | width: units.gu(40) | ||
| 670 | 105 | height: width | ||
| 671 | 106 | Layouts.item: item | ||
| 672 | 107 | } | ||
| 673 | 108 | ItemLayout { | ||
| 674 | 109 | objectName: "magentaContainer" | ||
| 675 | 110 | item: "mainMagenta" | ||
| 676 | 111 | width: units.gu(60) | ||
| 677 | 112 | height: width | ||
| 678 | 113 | Layouts.item: item | ||
| 679 | 114 | } | ||
| 680 | 115 | } | ||
| 681 | 116 | } | ||
| 682 | 117 | } | ||
| 683 | 118 | ] | ||
| 684 | 119 | |||
| 685 | 120 | // default layout for mainLayout | ||
| 686 | 121 | Flow { | ||
| 687 | 122 | objectName: "mainDefaultLayout" | ||
| 688 | 123 | anchors.fill: parent | ||
| 689 | 124 | Rectangle { | ||
| 690 | 125 | objectName: "mainRed" | ||
| 691 | 126 | width: units.gu(15) | ||
| 692 | 127 | height: width | ||
| 693 | 128 | color: "red" | ||
| 694 | 129 | Layouts.item: "mainRed" | ||
| 695 | 130 | } | ||
| 696 | 131 | Rectangle { | ||
| 697 | 132 | objectName: "mainGreen" | ||
| 698 | 133 | width: units.gu(15) | ||
| 699 | 134 | height: width | ||
| 700 | 135 | color: "green" | ||
| 701 | 136 | Layouts.item: "mainGreen" | ||
| 702 | 137 | } | ||
| 703 | 138 | Rectangle { | ||
| 704 | 139 | objectName: "mainBlue" | ||
| 705 | 140 | width: units.gu(15) | ||
| 706 | 141 | height: width | ||
| 707 | 142 | color: "blue" | ||
| 708 | 143 | Layouts.item: "mainBlue" | ||
| 709 | 144 | } | ||
| 710 | 145 | Rectangle { | ||
| 711 | 146 | objectName: "mainMagenta" | ||
| 712 | 147 | width: units.gu(15) | ||
| 713 | 148 | height: width | ||
| 714 | 149 | color: "magenta" | ||
| 715 | 150 | Layouts.item: "mainMagenta" | ||
| 716 | 151 | } | ||
| 717 | 152 | Rectangle { | ||
| 718 | 153 | objectName: "mainHidden" | ||
| 719 | 154 | width: units.gu(15) | ||
| 720 | 155 | height: width | ||
| 721 | 156 | color: "yellow" | ||
| 722 | 157 | visible: false | ||
| 723 | 158 | } | ||
| 724 | 159 | } | ||
| 725 | 160 | } | ||
| 726 | 161 | } | ||
| 727 | 162 | } | ||
| 728 | 163 | } | ||
| 729 | 0 | 164 | ||
| 730 | === added file 'tests/unit_x11/tst_layouts/Visibility.qml' | |||
| 731 | --- tests/unit_x11/tst_layouts/Visibility.qml 1970-01-01 00:00:00 +0000 | |||
| 732 | +++ tests/unit_x11/tst_layouts/Visibility.qml 2014-05-20 19:37:09 +0000 | |||
| 733 | @@ -0,0 +1,84 @@ | |||
| 734 | 1 | /* | ||
| 735 | 2 | * Copyright 2014 Canonical Ltd. | ||
| 736 | 3 | * | ||
| 737 | 4 | * This program is free software; you can redistribute it and/or modify | ||
| 738 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
| 739 | 6 | * the Free Software Foundation; version 3. | ||
| 740 | 7 | * | ||
| 741 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 742 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 743 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 744 | 11 | * GNU Lesser General Public License for more details. | ||
| 745 | 12 | * | ||
| 746 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 747 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 748 | 15 | */ | ||
| 749 | 16 | |||
| 750 | 17 | import QtQuick 2.0 | ||
| 751 | 18 | import Ubuntu.Components 1.1 | ||
| 752 | 19 | import Ubuntu.Layouts 1.0 | ||
| 753 | 20 | |||
| 754 | 21 | MainView { | ||
| 755 | 22 | id: main | ||
| 756 | 23 | objectName: "mainView" | ||
| 757 | 24 | applicationName: "test-app" | ||
| 758 | 25 | |||
| 759 | 26 | /* | ||
| 760 | 27 | This property enables the application to change orientation | ||
| 761 | 28 | when the device is rotated. The default is false. | ||
| 762 | 29 | */ | ||
| 763 | 30 | automaticOrientation: true // TODO: support wide aspect ratios, esp. on prepareGamePage | ||
| 764 | 31 | |||
| 765 | 32 | property bool boundValue: true | ||
| 766 | 33 | |||
| 767 | 34 | width: units.gu(100) | ||
| 768 | 35 | height: units.gu(75) | ||
| 769 | 36 | |||
| 770 | 37 | function portraitLayout() { | ||
| 771 | 38 | width = units.gu(50); | ||
| 772 | 39 | } | ||
| 773 | 40 | function landscapeLayout() { | ||
| 774 | 41 | width = units.gu(100); | ||
| 775 | 42 | } | ||
| 776 | 43 | |||
| 777 | 44 | PageStack { | ||
| 778 | 45 | Component.onCompleted: push(testPage) | ||
| 779 | 46 | |||
| 780 | 47 | Page { | ||
| 781 | 48 | title: i18n.tr("Conditional Layouts with PageStack") | ||
| 782 | 49 | id: testPage | ||
| 783 | 50 | visible: false | ||
| 784 | 51 | |||
| 785 | 52 | Layouts { | ||
| 786 | 53 | id: layouts | ||
| 787 | 54 | objectName: "layoutManager" | ||
| 788 | 55 | width: parent.width | ||
| 789 | 56 | height: parent.height | ||
| 790 | 57 | layouts: [ | ||
| 791 | 58 | ConditionalLayout { | ||
| 792 | 59 | name: "wide" | ||
| 793 | 60 | when: layouts.width < units.gu(60) | ||
| 794 | 61 | UbuntuShape { | ||
| 795 | 62 | width: units.gu(20) | ||
| 796 | 63 | height: units.gu(20) | ||
| 797 | 64 | color: "red" | ||
| 798 | 65 | Label { text: "wide" } | ||
| 799 | 66 | } | ||
| 800 | 67 | } | ||
| 801 | 68 | ] | ||
| 802 | 69 | |||
| 803 | 70 | // This is a default layout. | ||
| 804 | 71 | // When using a PageStack and layouts is not empty, it won't display or switch to the default layout. | ||
| 805 | 72 | // However it only works when putting it into the layouts list with an inversed condition. | ||
| 806 | 73 | UbuntuShape { | ||
| 807 | 74 | objectName: "DefaultLayout" | ||
| 808 | 75 | width: units.gu(20) | ||
| 809 | 76 | height: units.gu(20) | ||
| 810 | 77 | color: "green" | ||
| 811 | 78 | visible: main.boundValue | ||
| 812 | 79 | Label { text: "default" } | ||
| 813 | 80 | } | ||
| 814 | 81 | } | ||
| 815 | 82 | } | ||
| 816 | 83 | } | ||
| 817 | 84 | } | ||
| 818 | 0 | 85 | ||
| 819 | === modified file 'tests/unit_x11/tst_layouts/tst_layouts.cpp' | |||
| 820 | --- tests/unit_x11/tst_layouts/tst_layouts.cpp 2014-03-19 12:48:33 +0000 | |||
| 821 | +++ tests/unit_x11/tst_layouts/tst_layouts.cpp 2014-05-20 19:37:09 +0000 | |||
| 822 | @@ -72,6 +72,25 @@ | |||
| 823 | 72 | return (children.count() > 0) ? children[0] : 0; | 72 | return (children.count() > 0) ? children[0] : 0; |
| 824 | 73 | } | 73 | } |
| 825 | 74 | 74 | ||
| 826 | 75 | bool hasChildItem(QQuickItem *child, QQuickItem *parent) | ||
| 827 | 76 | { | ||
| 828 | 77 | QQuickItem *pl = child->parentItem(); | ||
| 829 | 78 | while (pl) { | ||
| 830 | 79 | if (pl == parent) { | ||
| 831 | 80 | return true; | ||
| 832 | 81 | } | ||
| 833 | 82 | pl = pl->parentItem(); | ||
| 834 | 83 | } | ||
| 835 | 84 | return false; | ||
| 836 | 85 | } | ||
| 837 | 86 | |||
| 838 | 87 | QQuickItem *prevSibling(QQuickItem *item) | ||
| 839 | 88 | { | ||
| 840 | 89 | QList<QQuickItem*> children = item->parentItem()->childItems(); | ||
| 841 | 90 | int index = children.indexOf(item); | ||
| 842 | 91 | return (index > 0) ? children.at(index - 1) : 0; | ||
| 843 | 92 | } | ||
| 844 | 93 | |||
| 845 | 75 | 94 | ||
| 846 | 76 | private Q_SLOTS: | 95 | private Q_SLOTS: |
| 847 | 77 | void initTestCase() | 96 | void initTestCase() |
| 848 | @@ -419,16 +438,16 @@ | |||
| 849 | 419 | 438 | ||
| 850 | 420 | void testCase_AnchorFilledReparenting() | 439 | void testCase_AnchorFilledReparenting() |
| 851 | 421 | { | 440 | { |
| 853 | 422 | QScopedPointer<QQuickView> view(loadTest("AnchorFilledReparenting.qml")); | 441 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledReparenting.qml")); |
| 854 | 423 | QVERIFY(view); | 442 | QVERIFY(view); |
| 855 | 424 | QQuickItem *root = view->rootObject(); | 443 | QQuickItem *root = view->rootObject(); |
| 856 | 425 | QVERIFY(root); | 444 | QVERIFY(root); |
| 857 | 426 | 445 | ||
| 859 | 427 | QQuickItem *layout = testItem(root, "layoutManager"); | 446 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 860 | 428 | QVERIFY(layout); | 447 | QVERIFY(layout); |
| 861 | 429 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 448 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 862 | 430 | 449 | ||
| 864 | 431 | QQuickItem *item = testItem(root, "testItem"); | 450 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 865 | 432 | QVERIFY(item); | 451 | QVERIFY(item); |
| 866 | 433 | 452 | ||
| 867 | 434 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 453 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 868 | @@ -436,27 +455,27 @@ | |||
| 869 | 436 | 455 | ||
| 870 | 437 | root->setWidth(root->width() + 100); | 456 | root->setWidth(root->width() + 100); |
| 871 | 438 | layoutChangeSpy.wait(100); | 457 | layoutChangeSpy.wait(100); |
| 873 | 439 | QQuickItem *testLayout = testItem(root, "testLayout"); | 458 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 874 | 440 | QVERIFY(testLayout); | 459 | QVERIFY(testLayout); |
| 875 | 441 | QCOMPARE(anchors->fill(), testLayout); | 460 | QCOMPARE(anchors->fill(), testLayout); |
| 876 | 442 | 461 | ||
| 877 | 443 | root->setWidth(root->width() - 100); | 462 | root->setWidth(root->width() - 100); |
| 878 | 444 | layoutChangeSpy.wait(100); | 463 | layoutChangeSpy.wait(100); |
| 880 | 445 | QCOMPARE(anchors->fill(), layout); | 464 | QCOMPARE(anchors->fill(), layout->contentItem()); |
| 881 | 446 | } | 465 | } |
| 882 | 447 | 466 | ||
| 883 | 448 | void testCase_AnchorFilledMargins() | 467 | void testCase_AnchorFilledMargins() |
| 884 | 449 | { | 468 | { |
| 886 | 450 | QScopedPointer<QQuickView> view(loadTest("AnchorFilledMargins.qml")); | 469 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledMargins.qml")); |
| 887 | 451 | QVERIFY(view); | 470 | QVERIFY(view); |
| 888 | 452 | QQuickItem *root = view->rootObject(); | 471 | QQuickItem *root = view->rootObject(); |
| 889 | 453 | QVERIFY(root); | 472 | QVERIFY(root); |
| 890 | 454 | 473 | ||
| 892 | 455 | QQuickItem *layout = testItem(root, "layoutManager"); | 474 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 893 | 456 | QVERIFY(layout); | 475 | QVERIFY(layout); |
| 894 | 457 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 476 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 895 | 458 | 477 | ||
| 897 | 459 | QQuickItem *item = testItem(root, "testItem"); | 478 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 898 | 460 | QVERIFY(item); | 479 | QVERIFY(item); |
| 899 | 461 | 480 | ||
| 900 | 462 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 481 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 901 | @@ -465,29 +484,29 @@ | |||
| 902 | 465 | root->setWidth(root->width() + 100); | 484 | root->setWidth(root->width() + 100); |
| 903 | 466 | layoutChangeSpy.wait(100); | 485 | layoutChangeSpy.wait(100); |
| 904 | 467 | 486 | ||
| 906 | 468 | QQuickItem *testLayout = testItem(root, "testLayout"); | 487 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 907 | 469 | QVERIFY(testLayout); | 488 | QVERIFY(testLayout); |
| 908 | 470 | QCOMPARE(anchors->fill(), testLayout); | 489 | QCOMPARE(anchors->fill(), testLayout); |
| 909 | 471 | QCOMPARE(anchors->margins(), 0.0); | 490 | QCOMPARE(anchors->margins(), 0.0); |
| 910 | 472 | 491 | ||
| 911 | 473 | root->setWidth(root->width() - 100); | 492 | root->setWidth(root->width() - 100); |
| 912 | 474 | layoutChangeSpy.wait(100); | 493 | layoutChangeSpy.wait(100); |
| 914 | 475 | QCOMPARE(anchors->fill(), layout); | 494 | QCOMPARE(anchors->fill(), layout->contentItem()); |
| 915 | 476 | QCOMPARE(anchors->margins(), 10.0); | 495 | QCOMPARE(anchors->margins(), 10.0); |
| 916 | 477 | } | 496 | } |
| 917 | 478 | 497 | ||
| 918 | 479 | void testCase_AnchorFilledSeparateMargins() | 498 | void testCase_AnchorFilledSeparateMargins() |
| 919 | 480 | { | 499 | { |
| 921 | 481 | QScopedPointer<QQuickView> view(loadTest("AnchorFilledSeparateMargins.qml")); | 500 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledSeparateMargins.qml")); |
| 922 | 482 | QVERIFY(view); | 501 | QVERIFY(view); |
| 923 | 483 | QQuickItem *root = view->rootObject(); | 502 | QQuickItem *root = view->rootObject(); |
| 924 | 484 | QVERIFY(root); | 503 | QVERIFY(root); |
| 925 | 485 | 504 | ||
| 927 | 486 | QQuickItem *layout = testItem(root, "layoutManager"); | 505 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 928 | 487 | QVERIFY(layout); | 506 | QVERIFY(layout); |
| 929 | 488 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 507 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 930 | 489 | 508 | ||
| 932 | 490 | QQuickItem *item = testItem(root, "testItem"); | 509 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 933 | 491 | QVERIFY(item); | 510 | QVERIFY(item); |
| 934 | 492 | 511 | ||
| 935 | 493 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 512 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 936 | @@ -496,7 +515,7 @@ | |||
| 937 | 496 | root->setWidth(root->width() + 100); | 515 | root->setWidth(root->width() + 100); |
| 938 | 497 | layoutChangeSpy.wait(100); | 516 | layoutChangeSpy.wait(100); |
| 939 | 498 | 517 | ||
| 941 | 499 | QQuickItem *testLayout = testItem(root, "testLayout"); | 518 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 942 | 500 | QVERIFY(testLayout); | 519 | QVERIFY(testLayout); |
| 943 | 501 | QCOMPARE(anchors->fill(), testLayout); | 520 | QCOMPARE(anchors->fill(), testLayout); |
| 944 | 502 | QCOMPARE(anchors->margins(), 0.0); | 521 | QCOMPARE(anchors->margins(), 0.0); |
| 945 | @@ -507,7 +526,7 @@ | |||
| 946 | 507 | 526 | ||
| 947 | 508 | root->setWidth(root->width() - 100); | 527 | root->setWidth(root->width() - 100); |
| 948 | 509 | layoutChangeSpy.wait(100); | 528 | layoutChangeSpy.wait(100); |
| 950 | 510 | QCOMPARE(anchors->fill(), layout); | 529 | QCOMPARE(anchors->fill(), layout->contentItem()); |
| 951 | 511 | QCOMPARE(anchors->leftMargin(), 10.0); | 530 | QCOMPARE(anchors->leftMargin(), 10.0); |
| 952 | 512 | QCOMPARE(anchors->topMargin(), 20.0); | 531 | QCOMPARE(anchors->topMargin(), 20.0); |
| 953 | 513 | QCOMPARE(anchors->rightMargin(), 30.0); | 532 | QCOMPARE(anchors->rightMargin(), 30.0); |
| 954 | @@ -516,16 +535,16 @@ | |||
| 955 | 516 | 535 | ||
| 956 | 517 | void testCase_AnchorCenteredInDefault() | 536 | void testCase_AnchorCenteredInDefault() |
| 957 | 518 | { | 537 | { |
| 959 | 519 | QScopedPointer<QQuickView> view(loadTest("AnchorCenteredInDefault.qml")); | 538 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorCenteredInDefault.qml")); |
| 960 | 520 | QVERIFY(view); | 539 | QVERIFY(view); |
| 961 | 521 | QQuickItem *root = view->rootObject(); | 540 | QQuickItem *root = view->rootObject(); |
| 962 | 522 | QVERIFY(root); | 541 | QVERIFY(root); |
| 963 | 523 | 542 | ||
| 965 | 524 | QQuickItem *layout = testItem(root, "layoutManager"); | 543 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 966 | 525 | QVERIFY(layout); | 544 | QVERIFY(layout); |
| 967 | 526 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 545 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 968 | 527 | 546 | ||
| 970 | 528 | QQuickItem *item = testItem(root, "testItem"); | 547 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 971 | 529 | QVERIFY(item); | 548 | QVERIFY(item); |
| 972 | 530 | 549 | ||
| 973 | 531 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 550 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 974 | @@ -533,335 +552,335 @@ | |||
| 975 | 533 | 552 | ||
| 976 | 534 | root->setWidth(root->width() + 100); | 553 | root->setWidth(root->width() + 100); |
| 977 | 535 | layoutChangeSpy.wait(100); | 554 | layoutChangeSpy.wait(100); |
| 979 | 536 | QQuickItem *testLayout = testItem(root, "testLayout"); | 555 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 980 | 537 | QVERIFY(testLayout); | 556 | QVERIFY(testLayout); |
| 981 | 538 | QCOMPARE(anchors->fill(), testLayout); | 557 | QCOMPARE(anchors->fill(), testLayout); |
| 982 | 539 | 558 | ||
| 983 | 540 | root->setWidth(root->width() - 100); | 559 | root->setWidth(root->width() - 100); |
| 984 | 541 | layoutChangeSpy.wait(100); | 560 | layoutChangeSpy.wait(100); |
| 986 | 542 | QCOMPARE(anchors->centerIn(), layout); | 561 | QCOMPARE(anchors->centerIn(), layout->contentItem()); |
| 987 | 543 | } | 562 | } |
| 988 | 544 | 563 | ||
| 989 | 545 | void testCase_AnchorVerticalCenter() | 564 | void testCase_AnchorVerticalCenter() |
| 990 | 546 | { | 565 | { |
| 992 | 547 | QScopedPointer<QQuickView> view(loadTest("AnchorVerticalCenter.qml")); | 566 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorVerticalCenter.qml")); |
| 993 | 548 | QVERIFY(view); | 567 | QVERIFY(view); |
| 994 | 549 | QQuickItem *root = view->rootObject(); | 568 | QQuickItem *root = view->rootObject(); |
| 995 | 550 | QVERIFY(root); | 569 | QVERIFY(root); |
| 996 | 551 | 570 | ||
| 998 | 552 | QQuickItem *layout = testItem(root, "layoutManager"); | 571 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 999 | 553 | QVERIFY(layout); | 572 | QVERIFY(layout); |
| 1000 | 554 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 573 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1001 | 555 | 574 | ||
| 1003 | 556 | QQuickItem *item = testItem(root, "testItem"); | 575 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1004 | 557 | QVERIFY(item); | 576 | QVERIFY(item); |
| 1005 | 558 | 577 | ||
| 1006 | 559 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 578 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1007 | 560 | QVERIFY(anchors); | 579 | QVERIFY(anchors); |
| 1008 | 561 | 580 | ||
| 1010 | 562 | QCOMPARE(anchors->verticalCenter().item, layout); | 581 | QCOMPARE(anchors->verticalCenter().item, layout->contentItem()); |
| 1011 | 563 | 582 | ||
| 1012 | 564 | root->setWidth(root->width() + 100); | 583 | root->setWidth(root->width() + 100); |
| 1013 | 565 | layoutChangeSpy.wait(100); | 584 | layoutChangeSpy.wait(100); |
| 1015 | 566 | QQuickItem *testLayout = testItem(root, "testLayout"); | 585 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1016 | 567 | QVERIFY(testLayout); | 586 | QVERIFY(testLayout); |
| 1017 | 568 | QCOMPARE(anchors->fill(), testLayout); | 587 | QCOMPARE(anchors->fill(), testLayout); |
| 1018 | 569 | 588 | ||
| 1019 | 570 | root->setWidth(root->width() - 100); | 589 | root->setWidth(root->width() - 100); |
| 1020 | 571 | layoutChangeSpy.wait(100); | 590 | layoutChangeSpy.wait(100); |
| 1022 | 572 | QCOMPARE(anchors->verticalCenter().item, layout); | 591 | QCOMPARE(anchors->verticalCenter().item, layout->contentItem()); |
| 1023 | 573 | } | 592 | } |
| 1024 | 574 | 593 | ||
| 1025 | 575 | void testCase_AnchorVerticalCenterOffset() | 594 | void testCase_AnchorVerticalCenterOffset() |
| 1026 | 576 | { | 595 | { |
| 1028 | 577 | QScopedPointer<QQuickView> view(loadTest("AnchorVerticalCenterOffset.qml")); | 596 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorVerticalCenterOffset.qml")); |
| 1029 | 578 | QVERIFY(view); | 597 | QVERIFY(view); |
| 1030 | 579 | QQuickItem *root = view->rootObject(); | 598 | QQuickItem *root = view->rootObject(); |
| 1031 | 580 | QVERIFY(root); | 599 | QVERIFY(root); |
| 1032 | 581 | 600 | ||
| 1034 | 582 | QQuickItem *layout = testItem(root, "layoutManager"); | 601 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1035 | 583 | QVERIFY(layout); | 602 | QVERIFY(layout); |
| 1036 | 584 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 603 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1037 | 585 | 604 | ||
| 1039 | 586 | QQuickItem *item = testItem(root, "testItem"); | 605 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1040 | 587 | QVERIFY(item); | 606 | QVERIFY(item); |
| 1041 | 588 | 607 | ||
| 1042 | 589 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 608 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1043 | 590 | QVERIFY(anchors); | 609 | QVERIFY(anchors); |
| 1044 | 591 | 610 | ||
| 1046 | 592 | QCOMPARE(anchors->verticalCenter().item, layout); | 611 | QCOMPARE(anchors->verticalCenter().item, layout->contentItem()); |
| 1047 | 593 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); | 612 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); |
| 1048 | 594 | 613 | ||
| 1049 | 595 | root->setWidth(root->width() + 100); | 614 | root->setWidth(root->width() + 100); |
| 1050 | 596 | layoutChangeSpy.wait(100); | 615 | layoutChangeSpy.wait(100); |
| 1052 | 597 | QQuickItem *testLayout = qobject_cast<QQuickItem*>(testItem(root, "testLayout")); | 616 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1053 | 598 | QVERIFY(testLayout); | 617 | QVERIFY(testLayout); |
| 1054 | 599 | QCOMPARE(anchors->fill(), testLayout); | 618 | QCOMPARE(anchors->fill(), testLayout); |
| 1055 | 600 | // no need to check offset as it does not affect the fill | 619 | // no need to check offset as it does not affect the fill |
| 1056 | 601 | 620 | ||
| 1057 | 602 | root->setWidth(root->width() - 100); | 621 | root->setWidth(root->width() - 100); |
| 1058 | 603 | layoutChangeSpy.wait(100); | 622 | layoutChangeSpy.wait(100); |
| 1060 | 604 | QCOMPARE(anchors->verticalCenter().item, layout); | 623 | QCOMPARE(anchors->verticalCenter().item, layout->contentItem()); |
| 1061 | 605 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); | 624 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); |
| 1062 | 606 | } | 625 | } |
| 1063 | 607 | 626 | ||
| 1064 | 608 | void testCase_AnchorHorizontalCenter() | 627 | void testCase_AnchorHorizontalCenter() |
| 1065 | 609 | { | 628 | { |
| 1067 | 610 | QScopedPointer<QQuickView> view(loadTest("AnchorHorizontalCenter.qml")); | 629 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorHorizontalCenter.qml")); |
| 1068 | 611 | QVERIFY(view); | 630 | QVERIFY(view); |
| 1069 | 612 | QQuickItem *root = view->rootObject(); | 631 | QQuickItem *root = view->rootObject(); |
| 1070 | 613 | QVERIFY(root); | 632 | QVERIFY(root); |
| 1071 | 614 | 633 | ||
| 1073 | 615 | QQuickItem *layout = testItem(root, "layoutManager"); | 634 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1074 | 616 | QVERIFY(layout); | 635 | QVERIFY(layout); |
| 1075 | 617 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 636 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1076 | 618 | 637 | ||
| 1078 | 619 | QQuickItem *item = testItem(root, "testItem"); | 638 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1079 | 620 | QVERIFY(item); | 639 | QVERIFY(item); |
| 1080 | 621 | 640 | ||
| 1081 | 622 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 641 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1082 | 623 | QVERIFY(anchors); | 642 | QVERIFY(anchors); |
| 1083 | 624 | 643 | ||
| 1085 | 625 | QCOMPARE(anchors->horizontalCenter().item, layout); | 644 | QCOMPARE(anchors->horizontalCenter().item, layout->contentItem()); |
| 1086 | 626 | 645 | ||
| 1087 | 627 | root->setWidth(root->width() + 100); | 646 | root->setWidth(root->width() + 100); |
| 1088 | 628 | layoutChangeSpy.wait(100); | 647 | layoutChangeSpy.wait(100); |
| 1090 | 629 | QQuickItem *testLayout = testItem(root, "testLayout"); | 648 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1091 | 630 | QVERIFY(testLayout); | 649 | QVERIFY(testLayout); |
| 1092 | 631 | QCOMPARE(anchors->fill(), testLayout); | 650 | QCOMPARE(anchors->fill(), testLayout); |
| 1093 | 632 | 651 | ||
| 1094 | 633 | root->setWidth(root->width() - 100); | 652 | root->setWidth(root->width() - 100); |
| 1095 | 634 | layoutChangeSpy.wait(100); | 653 | layoutChangeSpy.wait(100); |
| 1097 | 635 | QCOMPARE(anchors->horizontalCenter().item, layout); | 654 | QCOMPARE(anchors->horizontalCenter().item, layout->contentItem()); |
| 1098 | 636 | } | 655 | } |
| 1099 | 637 | 656 | ||
| 1100 | 638 | void testCase_AnchorHorizontalCenterOffset() | 657 | void testCase_AnchorHorizontalCenterOffset() |
| 1101 | 639 | { | 658 | { |
| 1103 | 640 | QScopedPointer<QQuickView> view(loadTest("AnchorHorizontalCenterOffset.qml")); | 659 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorHorizontalCenterOffset.qml")); |
| 1104 | 641 | QVERIFY(view); | 660 | QVERIFY(view); |
| 1105 | 642 | QQuickItem *root = view->rootObject(); | 661 | QQuickItem *root = view->rootObject(); |
| 1106 | 643 | QVERIFY(root); | 662 | QVERIFY(root); |
| 1107 | 644 | 663 | ||
| 1109 | 645 | QQuickItem *layout = testItem(root, "layoutManager"); | 664 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1110 | 646 | QVERIFY(layout); | 665 | QVERIFY(layout); |
| 1111 | 647 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 666 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1112 | 648 | 667 | ||
| 1114 | 649 | QQuickItem *item = testItem(root, "testItem"); | 668 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1115 | 650 | QVERIFY(item); | 669 | QVERIFY(item); |
| 1116 | 651 | 670 | ||
| 1117 | 652 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 671 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1118 | 653 | QVERIFY(anchors); | 672 | QVERIFY(anchors); |
| 1119 | 654 | 673 | ||
| 1121 | 655 | QCOMPARE(anchors->horizontalCenter().item, layout); | 674 | QCOMPARE(anchors->horizontalCenter().item, layout->contentItem()); |
| 1122 | 656 | QCOMPARE(anchors->horizontalCenterOffset(), 50.0); | 675 | QCOMPARE(anchors->horizontalCenterOffset(), 50.0); |
| 1123 | 657 | 676 | ||
| 1124 | 658 | root->setWidth(root->width() + 100); | 677 | root->setWidth(root->width() + 100); |
| 1125 | 659 | layoutChangeSpy.wait(100); | 678 | layoutChangeSpy.wait(100); |
| 1127 | 660 | QQuickItem *testLayout = testItem(root, "testLayout"); | 679 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1128 | 661 | QVERIFY(testLayout); | 680 | QVERIFY(testLayout); |
| 1129 | 662 | QCOMPARE(anchors->fill(), testLayout); | 681 | QCOMPARE(anchors->fill(), testLayout); |
| 1130 | 663 | // no need to check offset as it does not affect the fill | 682 | // no need to check offset as it does not affect the fill |
| 1131 | 664 | 683 | ||
| 1132 | 665 | root->setWidth(root->width() - 100); | 684 | root->setWidth(root->width() - 100); |
| 1133 | 666 | layoutChangeSpy.wait(100); | 685 | layoutChangeSpy.wait(100); |
| 1135 | 667 | QCOMPARE(anchors->horizontalCenter().item, layout); | 686 | QCOMPARE(anchors->horizontalCenter().item, layout->contentItem()); |
| 1136 | 668 | QCOMPARE(anchors->horizontalCenterOffset(), 50.0); | 687 | QCOMPARE(anchors->horizontalCenterOffset(), 50.0); |
| 1137 | 669 | } | 688 | } |
| 1138 | 670 | 689 | ||
| 1139 | 671 | void testCase_AnchorCenterWithOffset() | 690 | void testCase_AnchorCenterWithOffset() |
| 1140 | 672 | { | 691 | { |
| 1142 | 673 | QScopedPointer<QQuickView> view(loadTest("AnchorCenterWithOffset.qml")); | 692 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorCenterWithOffset.qml")); |
| 1143 | 674 | QVERIFY(view); | 693 | QVERIFY(view); |
| 1144 | 675 | QQuickItem *root = view->rootObject(); | 694 | QQuickItem *root = view->rootObject(); |
| 1145 | 676 | QVERIFY(root); | 695 | QVERIFY(root); |
| 1146 | 677 | 696 | ||
| 1148 | 678 | QQuickItem *layout = testItem(root, "layoutManager"); | 697 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1149 | 679 | QVERIFY(layout); | 698 | QVERIFY(layout); |
| 1150 | 680 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 699 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1151 | 681 | 700 | ||
| 1153 | 682 | QQuickItem *item = testItem(root, "testItem"); | 701 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1154 | 683 | QVERIFY(item); | 702 | QVERIFY(item); |
| 1155 | 684 | 703 | ||
| 1156 | 685 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 704 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1157 | 686 | QVERIFY(anchors); | 705 | QVERIFY(anchors); |
| 1158 | 687 | 706 | ||
| 1160 | 688 | QCOMPARE(anchors->centerIn(), layout); | 707 | QCOMPARE(anchors->centerIn(), layout->contentItem()); |
| 1161 | 689 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); | 708 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); |
| 1162 | 690 | QCOMPARE(anchors->horizontalCenterOffset(), 40.0); | 709 | QCOMPARE(anchors->horizontalCenterOffset(), 40.0); |
| 1163 | 691 | 710 | ||
| 1164 | 692 | root->setWidth(root->width() + 100); | 711 | root->setWidth(root->width() + 100); |
| 1165 | 693 | layoutChangeSpy.wait(100); | 712 | layoutChangeSpy.wait(100); |
| 1167 | 694 | QQuickItem *testLayout = testItem(root, "testLayout"); | 713 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1168 | 695 | QVERIFY(testLayout); | 714 | QVERIFY(testLayout); |
| 1169 | 696 | QCOMPARE(anchors->fill(), testLayout); | 715 | QCOMPARE(anchors->fill(), testLayout); |
| 1170 | 697 | // no need to check offsets as it does not affect the fill | 716 | // no need to check offsets as it does not affect the fill |
| 1171 | 698 | 717 | ||
| 1172 | 699 | root->setWidth(root->width() - 100); | 718 | root->setWidth(root->width() - 100); |
| 1173 | 700 | layoutChangeSpy.wait(100); | 719 | layoutChangeSpy.wait(100); |
| 1175 | 701 | QCOMPARE(anchors->centerIn(), layout); | 720 | QCOMPARE(anchors->centerIn(), layout->contentItem()); |
| 1176 | 702 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); | 721 | QCOMPARE(anchors->verticalCenterOffset(), 50.0); |
| 1177 | 703 | QCOMPARE(anchors->horizontalCenterOffset(), 40.0); | 722 | QCOMPARE(anchors->horizontalCenterOffset(), 40.0); |
| 1178 | 704 | } | 723 | } |
| 1179 | 705 | 724 | ||
| 1180 | 706 | void testCase_AnchorLeft() | 725 | void testCase_AnchorLeft() |
| 1181 | 707 | { | 726 | { |
| 1183 | 708 | QScopedPointer<QQuickView> view(loadTest("AnchorLeft.qml")); | 727 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorLeft.qml")); |
| 1184 | 709 | QVERIFY(view); | 728 | QVERIFY(view); |
| 1185 | 710 | QQuickItem *root = view->rootObject(); | 729 | QQuickItem *root = view->rootObject(); |
| 1186 | 711 | QVERIFY(root); | 730 | QVERIFY(root); |
| 1187 | 712 | 731 | ||
| 1189 | 713 | QQuickItem *layout = testItem(root, "layoutManager"); | 732 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1190 | 714 | QVERIFY(layout); | 733 | QVERIFY(layout); |
| 1191 | 715 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 734 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1192 | 716 | 735 | ||
| 1194 | 717 | QQuickItem *item = testItem(root, "testItem"); | 736 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1195 | 718 | QVERIFY(item); | 737 | QVERIFY(item); |
| 1196 | 719 | 738 | ||
| 1197 | 720 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 739 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1198 | 721 | QVERIFY(anchors); | 740 | QVERIFY(anchors); |
| 1199 | 722 | 741 | ||
| 1201 | 723 | QCOMPARE(anchors->left().item, layout); | 742 | QCOMPARE(anchors->left().item, layout->contentItem()); |
| 1202 | 724 | QCOMPARE(anchors->leftMargin(), 10.0); | 743 | QCOMPARE(anchors->leftMargin(), 10.0); |
| 1203 | 725 | 744 | ||
| 1204 | 726 | root->setWidth(root->width() + 100); | 745 | root->setWidth(root->width() + 100); |
| 1205 | 727 | layoutChangeSpy.wait(100); | 746 | layoutChangeSpy.wait(100); |
| 1207 | 728 | QQuickItem *testLayout = testItem(root, "testLayout"); | 747 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1208 | 729 | QVERIFY(testLayout); | 748 | QVERIFY(testLayout); |
| 1209 | 730 | QCOMPARE(anchors->fill(), testLayout); | 749 | QCOMPARE(anchors->fill(), testLayout); |
| 1210 | 731 | QCOMPARE(anchors->leftMargin(), 0.0); | 750 | QCOMPARE(anchors->leftMargin(), 0.0); |
| 1211 | 732 | 751 | ||
| 1212 | 733 | root->setWidth(root->width() - 100); | 752 | root->setWidth(root->width() - 100); |
| 1213 | 734 | layoutChangeSpy.wait(100); | 753 | layoutChangeSpy.wait(100); |
| 1215 | 735 | QCOMPARE(anchors->left().item, layout); | 754 | QCOMPARE(anchors->left().item, layout->contentItem()); |
| 1216 | 736 | QCOMPARE(anchors->leftMargin(), 10.0); | 755 | QCOMPARE(anchors->leftMargin(), 10.0); |
| 1217 | 737 | } | 756 | } |
| 1218 | 738 | 757 | ||
| 1219 | 739 | void testCase_AnchorTop() | 758 | void testCase_AnchorTop() |
| 1220 | 740 | { | 759 | { |
| 1222 | 741 | QScopedPointer<QQuickView> view(loadTest("AnchorTop.qml")); | 760 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorTop.qml")); |
| 1223 | 742 | QVERIFY(view); | 761 | QVERIFY(view); |
| 1224 | 743 | QQuickItem *root = view->rootObject(); | 762 | QQuickItem *root = view->rootObject(); |
| 1225 | 744 | QVERIFY(root); | 763 | QVERIFY(root); |
| 1226 | 745 | 764 | ||
| 1228 | 746 | QQuickItem *layout = testItem(root, "layoutManager"); | 765 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1229 | 747 | QVERIFY(layout); | 766 | QVERIFY(layout); |
| 1230 | 748 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 767 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1231 | 749 | 768 | ||
| 1233 | 750 | QQuickItem *item = testItem(root, "testItem"); | 769 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1234 | 751 | QVERIFY(item); | 770 | QVERIFY(item); |
| 1235 | 752 | 771 | ||
| 1236 | 753 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 772 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1237 | 754 | QVERIFY(anchors); | 773 | QVERIFY(anchors); |
| 1238 | 755 | 774 | ||
| 1240 | 756 | QCOMPARE(anchors->top().item, layout); | 775 | QCOMPARE(anchors->top().item, layout->contentItem()); |
| 1241 | 757 | QCOMPARE(anchors->topMargin(), 10.0); | 776 | QCOMPARE(anchors->topMargin(), 10.0); |
| 1242 | 758 | 777 | ||
| 1243 | 759 | root->setWidth(root->width() + 100); | 778 | root->setWidth(root->width() + 100); |
| 1244 | 760 | layoutChangeSpy.wait(100); | 779 | layoutChangeSpy.wait(100); |
| 1246 | 761 | QQuickItem *testLayout = testItem(root, "testLayout"); | 780 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1247 | 762 | QVERIFY(testLayout); | 781 | QVERIFY(testLayout); |
| 1248 | 763 | QCOMPARE(anchors->fill(), testLayout); | 782 | QCOMPARE(anchors->fill(), testLayout); |
| 1249 | 764 | QCOMPARE(anchors->topMargin(), 0.0); | 783 | QCOMPARE(anchors->topMargin(), 0.0); |
| 1250 | 765 | 784 | ||
| 1251 | 766 | root->setWidth(root->width() - 100); | 785 | root->setWidth(root->width() - 100); |
| 1252 | 767 | layoutChangeSpy.wait(100); | 786 | layoutChangeSpy.wait(100); |
| 1254 | 768 | QCOMPARE(anchors->top().item, layout); | 787 | QCOMPARE(anchors->top().item, layout->contentItem()); |
| 1255 | 769 | QCOMPARE(anchors->topMargin(), 10.0); | 788 | QCOMPARE(anchors->topMargin(), 10.0); |
| 1256 | 770 | } | 789 | } |
| 1257 | 771 | 790 | ||
| 1258 | 772 | void testCase_AnchorRight() | 791 | void testCase_AnchorRight() |
| 1259 | 773 | { | 792 | { |
| 1261 | 774 | QScopedPointer<QQuickView> view(loadTest("AnchorRight.qml")); | 793 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorRight.qml")); |
| 1262 | 775 | QVERIFY(view); | 794 | QVERIFY(view); |
| 1263 | 776 | QQuickItem *root = view->rootObject(); | 795 | QQuickItem *root = view->rootObject(); |
| 1264 | 777 | QVERIFY(root); | 796 | QVERIFY(root); |
| 1265 | 778 | 797 | ||
| 1267 | 779 | QQuickItem *layout = testItem(root, "layoutManager"); | 798 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1268 | 780 | QVERIFY(layout); | 799 | QVERIFY(layout); |
| 1269 | 781 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 800 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1270 | 782 | 801 | ||
| 1272 | 783 | QQuickItem *item = testItem(root, "testItem"); | 802 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1273 | 784 | QVERIFY(item); | 803 | QVERIFY(item); |
| 1274 | 785 | 804 | ||
| 1275 | 786 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 805 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1276 | 787 | QVERIFY(anchors); | 806 | QVERIFY(anchors); |
| 1277 | 788 | 807 | ||
| 1279 | 789 | QCOMPARE(anchors->right().item, layout); | 808 | QCOMPARE(anchors->right().item, layout->contentItem()); |
| 1280 | 790 | QCOMPARE(anchors->rightMargin(), 10.0); | 809 | QCOMPARE(anchors->rightMargin(), 10.0); |
| 1281 | 791 | 810 | ||
| 1282 | 792 | root->setWidth(root->width() + 100); | 811 | root->setWidth(root->width() + 100); |
| 1283 | 793 | layoutChangeSpy.wait(100); | 812 | layoutChangeSpy.wait(100); |
| 1285 | 794 | QQuickItem *testLayout = testItem(root, "testLayout"); | 813 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1286 | 795 | QVERIFY(testLayout); | 814 | QVERIFY(testLayout); |
| 1287 | 796 | QCOMPARE(anchors->fill(), testLayout); | 815 | QCOMPARE(anchors->fill(), testLayout); |
| 1288 | 797 | QCOMPARE(anchors->rightMargin(), 0.0); | 816 | QCOMPARE(anchors->rightMargin(), 0.0); |
| 1289 | 798 | 817 | ||
| 1290 | 799 | root->setWidth(root->width() - 100); | 818 | root->setWidth(root->width() - 100); |
| 1291 | 800 | layoutChangeSpy.wait(100); | 819 | layoutChangeSpy.wait(100); |
| 1293 | 801 | QCOMPARE(anchors->right().item, layout); | 820 | QCOMPARE(anchors->right().item, layout->contentItem()); |
| 1294 | 802 | QCOMPARE(anchors->rightMargin(), 10.0); | 821 | QCOMPARE(anchors->rightMargin(), 10.0); |
| 1295 | 803 | } | 822 | } |
| 1296 | 804 | 823 | ||
| 1297 | 805 | void testCase_AnchorBottom() | 824 | void testCase_AnchorBottom() |
| 1298 | 806 | { | 825 | { |
| 1300 | 807 | QScopedPointer<QQuickView> view(loadTest("AnchorBottom.qml")); | 826 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorBottom.qml")); |
| 1301 | 808 | QVERIFY(view); | 827 | QVERIFY(view); |
| 1302 | 809 | QQuickItem *root = view->rootObject(); | 828 | QQuickItem *root = view->rootObject(); |
| 1303 | 810 | QVERIFY(root); | 829 | QVERIFY(root); |
| 1304 | 811 | 830 | ||
| 1306 | 812 | QQuickItem *layout = testItem(root, "layoutManager"); | 831 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1307 | 813 | QVERIFY(layout); | 832 | QVERIFY(layout); |
| 1308 | 814 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 833 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1309 | 815 | 834 | ||
| 1311 | 816 | QQuickItem *item = testItem(root, "testItem"); | 835 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1312 | 817 | QVERIFY(item); | 836 | QVERIFY(item); |
| 1313 | 818 | 837 | ||
| 1314 | 819 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 838 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1315 | 820 | QVERIFY(anchors); | 839 | QVERIFY(anchors); |
| 1316 | 821 | 840 | ||
| 1318 | 822 | QCOMPARE(anchors->bottom().item, layout); | 841 | QCOMPARE(anchors->bottom().item, layout->contentItem()); |
| 1319 | 823 | QCOMPARE(anchors->bottomMargin(), 10.0); | 842 | QCOMPARE(anchors->bottomMargin(), 10.0); |
| 1320 | 824 | 843 | ||
| 1321 | 825 | root->setWidth(root->width() + 100); | 844 | root->setWidth(root->width() + 100); |
| 1322 | 826 | layoutChangeSpy.wait(100); | 845 | layoutChangeSpy.wait(100); |
| 1324 | 827 | QQuickItem *testLayout = testItem(root, "testLayout"); | 846 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1325 | 828 | QVERIFY(testLayout); | 847 | QVERIFY(testLayout); |
| 1326 | 829 | QCOMPARE(anchors->fill(), testLayout); | 848 | QCOMPARE(anchors->fill(), testLayout); |
| 1327 | 830 | QCOMPARE(anchors->bottomMargin(), 0.0); | 849 | QCOMPARE(anchors->bottomMargin(), 0.0); |
| 1328 | 831 | 850 | ||
| 1329 | 832 | root->setWidth(root->width() - 100); | 851 | root->setWidth(root->width() - 100); |
| 1330 | 833 | layoutChangeSpy.wait(100); | 852 | layoutChangeSpy.wait(100); |
| 1332 | 834 | QCOMPARE(anchors->bottom().item, layout); | 853 | QCOMPARE(anchors->bottom().item, layout->contentItem()); |
| 1333 | 835 | QCOMPARE(anchors->bottomMargin(), 10.0); | 854 | QCOMPARE(anchors->bottomMargin(), 10.0); |
| 1334 | 836 | } | 855 | } |
| 1335 | 837 | 856 | ||
| 1336 | 838 | void testCase_AnchorAll() | 857 | void testCase_AnchorAll() |
| 1337 | 839 | { | 858 | { |
| 1339 | 840 | QScopedPointer<QQuickView> view(loadTest("AnchorAll.qml")); | 859 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorAll.qml")); |
| 1340 | 841 | QVERIFY(view); | 860 | QVERIFY(view); |
| 1341 | 842 | QQuickItem *root = view->rootObject(); | 861 | QQuickItem *root = view->rootObject(); |
| 1342 | 843 | QVERIFY(root); | 862 | QVERIFY(root); |
| 1343 | 844 | 863 | ||
| 1345 | 845 | QQuickItem *layout = testItem(root, "layoutManager"); | 864 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); |
| 1346 | 846 | QVERIFY(layout); | 865 | QVERIFY(layout); |
| 1347 | 847 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | 866 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); |
| 1348 | 848 | 867 | ||
| 1350 | 849 | QQuickItem *item = testItem(root, "testItem"); | 868 | QQuickItem *item = view->findItem<QQuickItem*>("testItem"); |
| 1351 | 850 | QVERIFY(item); | 869 | QVERIFY(item); |
| 1352 | 851 | 870 | ||
| 1353 | 852 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); | 871 | QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>(); |
| 1354 | 853 | QVERIFY(anchors); | 872 | QVERIFY(anchors); |
| 1355 | 854 | 873 | ||
| 1360 | 855 | QCOMPARE(anchors->left().item, layout); | 874 | QCOMPARE(anchors->left().item, layout->contentItem()); |
| 1361 | 856 | QCOMPARE(anchors->top().item, layout); | 875 | QCOMPARE(anchors->top().item, layout->contentItem()); |
| 1362 | 857 | QCOMPARE(anchors->right().item, layout); | 876 | QCOMPARE(anchors->right().item, layout->contentItem()); |
| 1363 | 858 | QCOMPARE(anchors->bottom().item, layout); | 877 | QCOMPARE(anchors->bottom().item, layout->contentItem()); |
| 1364 | 859 | QVERIFY(!anchors->fill()); | 878 | QVERIFY(!anchors->fill()); |
| 1365 | 860 | QCOMPARE(anchors->margins(), 20.0); | 879 | QCOMPARE(anchors->margins(), 20.0); |
| 1366 | 861 | 880 | ||
| 1367 | 862 | root->setWidth(root->width() + 100); | 881 | root->setWidth(root->width() + 100); |
| 1368 | 863 | layoutChangeSpy.wait(100); | 882 | layoutChangeSpy.wait(100); |
| 1370 | 864 | QQuickItem *testLayout = testItem(root, "testLayout"); | 883 | QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout"); |
| 1371 | 865 | QVERIFY(testLayout); | 884 | QVERIFY(testLayout); |
| 1372 | 866 | QCOMPARE(anchors->fill(), testLayout); | 885 | QCOMPARE(anchors->fill(), testLayout); |
| 1373 | 867 | QVERIFY(!anchors->left().item); | 886 | QVERIFY(!anchors->left().item); |
| 1374 | @@ -872,10 +891,10 @@ | |||
| 1375 | 872 | 891 | ||
| 1376 | 873 | root->setWidth(root->width() - 100); | 892 | root->setWidth(root->width() - 100); |
| 1377 | 874 | layoutChangeSpy.wait(100); | 893 | layoutChangeSpy.wait(100); |
| 1382 | 875 | QCOMPARE(anchors->left().item, layout); | 894 | QCOMPARE(anchors->left().item, layout->contentItem()); |
| 1383 | 876 | QCOMPARE(anchors->top().item, layout); | 895 | QCOMPARE(anchors->top().item, layout->contentItem()); |
| 1384 | 877 | QCOMPARE(anchors->right().item, layout); | 896 | QCOMPARE(anchors->right().item, layout->contentItem()); |
| 1385 | 878 | QCOMPARE(anchors->bottom().item, layout); | 897 | QCOMPARE(anchors->bottom().item, layout->contentItem()); |
| 1386 | 879 | QVERIFY(!anchors->fill()); | 898 | QVERIFY(!anchors->fill()); |
| 1387 | 880 | QCOMPARE(anchors->margins(), 20.0); | 899 | QCOMPARE(anchors->margins(), 20.0); |
| 1388 | 881 | } | 900 | } |
| 1389 | @@ -932,6 +951,115 @@ | |||
| 1390 | 932 | QCOMPARE(layoutChangeSpy.count(), 1); | 951 | QCOMPARE(layoutChangeSpy.count(), 1); |
| 1391 | 933 | } | 952 | } |
| 1392 | 934 | 953 | ||
| 1393 | 954 | // guard bug #1204834 and #1300668 | ||
| 1394 | 955 | void testCase_Visibility() | ||
| 1395 | 956 | { | ||
| 1396 | 957 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("Visibility.qml")); | ||
| 1397 | 958 | QVERIFY(view); | ||
| 1398 | 959 | QQuickItem *root = view->rootObject(); | ||
| 1399 | 960 | QVERIFY(root); | ||
| 1400 | 961 | |||
| 1401 | 962 | ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager"); | ||
| 1402 | 963 | QVERIFY(layout); | ||
| 1403 | 964 | QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged())); | ||
| 1404 | 965 | |||
| 1405 | 966 | QQuickItem *defaultLayout = testItem(root, "DefaultLayout"); | ||
| 1406 | 967 | QVERIFY(defaultLayout); | ||
| 1407 | 968 | |||
| 1408 | 969 | // invoke layout change | ||
| 1409 | 970 | view->rootObject()->metaObject()->invokeMethod(view->rootObject(), "portraitLayout"); | ||
| 1410 | 971 | layoutChangeSpy.wait(1000); | ||
| 1411 | 972 | QCOMPARE(defaultLayout->parentItem(), layout->contentItem()); | ||
| 1412 | 973 | // despite of visible property binding, the visibility of the component is false | ||
| 1413 | 974 | // while its parent is set to invisible | ||
| 1414 | 975 | QCOMPARE(defaultLayout->isVisible(), false); | ||
| 1415 | 976 | QCOMPARE(layout->contentItem()->isVisible(), false); | ||
| 1416 | 977 | |||
| 1417 | 978 | // change layout back | ||
| 1418 | 979 | layoutChangeSpy.clear(); | ||
| 1419 | 980 | view->rootObject()->metaObject()->invokeMethod(view->rootObject(), "landscapeLayout"); | ||
| 1420 | 981 | layoutChangeSpy.wait(1000); | ||
| 1421 | 982 | QCOMPARE(defaultLayout->parentItem(), layout->contentItem()); | ||
| 1422 | 983 | QCOMPARE(defaultLayout->isVisible(), true); | ||
| 1423 | 984 | QCOMPARE(layout->contentItem()->isVisible(), true); | ||
| 1424 | 985 | } | ||
| 1425 | 986 | |||
| 1426 | 987 | void testCase_NestedVisibility_data() { | ||
| 1427 | 988 | QTest::addColumn<QString>("layoutFunction"); | ||
| 1428 | 989 | QTest::addColumn<QString>("layoutName"); | ||
| 1429 | 990 | |||
| 1430 | 991 | QTest::newRow("portrait") << "tabletPortraitLayout" << "tabletPortrait"; | ||
| 1431 | 992 | QTest::newRow("landscape") << "tabletLandscapeLayout" << "tabletLandscape"; | ||
| 1432 | 993 | } | ||
| 1433 | 994 | |||
| 1434 | 995 | void testCase_NestedVisibility() | ||
| 1435 | 996 | { | ||
| 1436 | 997 | QFETCH(QString, layoutFunction); | ||
| 1437 | 998 | QFETCH(QString, layoutName); | ||
| 1438 | 999 | |||
| 1439 | 1000 | QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("NestedVisibility.qml")); | ||
| 1440 | 1001 | QVERIFY(view); | ||
| 1441 | 1002 | QQuickItem *root = view->rootObject(); | ||
| 1442 | 1003 | QVERIFY(root); | ||
| 1443 | 1004 | |||
| 1444 | 1005 | ULLayouts *mainLayout = view->findItem<ULLayouts*>("mainLayout"); | ||
| 1445 | 1006 | QVERIFY(mainLayout); | ||
| 1446 | 1007 | QQuickItem *red = testItem(mainLayout, "mainRed"); | ||
| 1447 | 1008 | QVERIFY(red); | ||
| 1448 | 1009 | QQuickItem *green = testItem(mainLayout, "mainGreen"); | ||
| 1449 | 1010 | QVERIFY(green); | ||
| 1450 | 1011 | QQuickItem *blue = testItem(mainLayout, "mainBlue"); | ||
| 1451 | 1012 | QVERIFY(blue); | ||
| 1452 | 1013 | QQuickItem *magenta = testItem(mainLayout, "mainMagenta"); | ||
| 1453 | 1014 | QVERIFY(magenta); | ||
| 1454 | 1015 | QQuickItem *hidden = testItem(mainLayout, "mainHidden"); | ||
| 1455 | 1016 | QVERIFY(hidden); | ||
| 1456 | 1017 | QCOMPARE(hidden->isVisible(), false); | ||
| 1457 | 1018 | // default is phone layout, get layd out items' neighbors | ||
| 1458 | 1019 | QQuickItem *greenPrev = prevSibling(green); | ||
| 1459 | 1020 | QQuickItem *magentaPrev = prevSibling(magenta); | ||
| 1460 | 1021 | QSizeF greenSize(green->width(), green->height()); | ||
| 1461 | 1022 | QSizeF magentaSize(magenta->width(), magenta->height()); | ||
| 1462 | 1023 | |||
| 1463 | 1024 | // invoke tablet layout change | ||
| 1464 | 1025 | QSignalSpy mainLayoutChangeSpy(mainLayout, SIGNAL(currentLayoutChanged())); | ||
| 1465 | 1026 | view->rootObject()->metaObject()->invokeMethod(view->rootObject(), layoutFunction.toLocal8Bit().data()); | ||
| 1466 | 1027 | mainLayoutChangeSpy.wait(1000); | ||
| 1467 | 1028 | // get the nested layout | ||
| 1468 | 1029 | ULLayouts *nestedLayout = qobject_cast<ULLayouts*>(testItem(mainLayout, "nestedLayout")); | ||
| 1469 | 1030 | QVERIFY(nestedLayout); | ||
| 1470 | 1031 | QQuickItem *nestedActiveLayout = testItem(nestedLayout, layoutName); | ||
| 1471 | 1032 | QVERIFY(nestedActiveLayout); | ||
| 1472 | 1033 | QCOMPARE(red->isVisible(), false); | ||
| 1473 | 1034 | QCOMPARE(green->isVisible(), true); | ||
| 1474 | 1035 | QCOMPARE(blue->isVisible(), false); | ||
| 1475 | 1036 | QCOMPARE(magenta->isVisible(), true); | ||
| 1476 | 1037 | QCOMPARE(hidden->isVisible(), false); | ||
| 1477 | 1038 | // we cannot use findChild() to locate green and magenta boxes, as reparenting only | ||
| 1478 | 1039 | // changes the parentItem, not the parent object itself; therefore we only check if | ||
| 1479 | 1040 | // their container is in the layout | ||
| 1480 | 1041 | QVERIFY(hasChildItem(green, nestedActiveLayout)); | ||
| 1481 | 1042 | QVERIFY(hasChildItem(magenta, nestedActiveLayout)); | ||
| 1482 | 1043 | |||
| 1483 | 1044 | // go back to default layout of main | ||
| 1484 | 1045 | mainLayoutChangeSpy.clear(); | ||
| 1485 | 1046 | view->rootObject()->metaObject()->invokeMethod(view->rootObject(), "phoneLayout"); | ||
| 1486 | 1047 | mainLayoutChangeSpy.wait(1000); | ||
| 1487 | 1048 | QCOMPARE(red->isVisible(), true); | ||
| 1488 | 1049 | QCOMPARE(green->isVisible(), true); | ||
| 1489 | 1050 | QCOMPARE(blue->isVisible(), true); | ||
| 1490 | 1051 | QCOMPARE(magenta->isVisible(), true); | ||
| 1491 | 1052 | QCOMPARE(hidden->isVisible(), false); | ||
| 1492 | 1053 | QCOMPARE(prevSibling(green), greenPrev); | ||
| 1493 | 1054 | QCOMPARE(prevSibling(magenta), magentaPrev); | ||
| 1494 | 1055 | QCOMPARE(green->width(), greenSize.width()); | ||
| 1495 | 1056 | QCOMPARE(green->height(), greenSize.height()); | ||
| 1496 | 1057 | QCOMPARE(magenta->width(), magentaSize.width()); | ||
| 1497 | 1058 | QCOMPARE(magenta->height(), magentaSize.height()); | ||
| 1498 | 1059 | QVERIFY(hasChildItem(green, mainLayout->contentItem())); | ||
| 1499 | 1060 | QVERIFY(hasChildItem(magenta, mainLayout->contentItem())); | ||
| 1500 | 1061 | } | ||
| 1501 | 1062 | |||
| 1502 | 935 | }; | 1063 | }; |
| 1503 | 936 | 1064 | ||
| 1504 | 937 | QTEST_MAIN(tst_Layouts) | 1065 | QTEST_MAIN(tst_Layouts) |
| 1505 | 938 | 1066 | ||
| 1506 | === modified file 'tests/unit_x11/tst_layouts/tst_layouts.pro' | |||
| 1507 | --- tests/unit_x11/tst_layouts/tst_layouts.pro 2014-02-18 13:27:23 +0000 | |||
| 1508 | +++ tests/unit_x11/tst_layouts/tst_layouts.pro 2014-05-20 19:37:09 +0000 | |||
| 1509 | @@ -37,4 +37,6 @@ | |||
| 1510 | 37 | AnchorAll.qml \ | 37 | AnchorAll.qml \ |
| 1511 | 38 | ItemInstanceAsProperty.qml \ | 38 | ItemInstanceAsProperty.qml \ |
| 1512 | 39 | DialerCrash.qml \ | 39 | DialerCrash.qml \ |
| 1514 | 40 | ExcludedItemDeleted.qml | 40 | ExcludedItemDeleted.qml \ |
| 1515 | 41 | Visibility.qml \ | ||
| 1516 | 42 | NestedVisibility.qml | ||
PASSED: Continuous integration, rev:1041
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://