Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds into lp:ubuntu-ui-toolkit/staging

45-selected-option-rebinds
Merge into staging

Proposed by Zsombor Egri on 2014-08-28

Status:	Superseded
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~zsombi/ubuntu-ui-toolkit/40-visualize-options
Diff against target:	81 lines (+36/-0) 3 files modified modules/Ubuntu/Components/ListItemPanel.qml (+6/-0) modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+3/-0) tests/unit_x11/tst_components/tst_listitem.qml (+27/-0)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds
Related bugs:	Link a bug report
Related blueprints:	SDK: Design a new ListItem and layouts (Undefined)

Reviewer	Review Type	Date Requested	Status
Ubuntu SDK team		2014-08-28	Pending
Review via email: mp+232513@code.launchpad.net

Commit message

Rebind ListItem contents when option is selected.

lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds updated on 2014-11-25

1227. By Zsombor Egri on 2014-08-28: prereq merge
1228. By Zsombor Egri on 2014-08-28: code added
1229. By Zsombor Egri on 2014-08-29: prereq merge
1230. By Zsombor Egri on 2014-08-29: prereq merge
1231. By Zsombor Egri on 2014-08-29: fix signal connects
1232. By Zsombor Egri on 2014-09-05: prereq merge
1233. By Zsombor Egri on 2014-09-06: prereq merge
1234. By Zsombor Egri on 2014-09-06: test fixed
1235. By Zsombor Egri on 2014-09-06: prereq merge
1236. By Zsombor Egri on 2014-09-06: prereq merge
1237. By Zsombor Egri on 2014-09-06: prereq
1238. By Zsombor Egri on 2014-09-08: prereq
1239. By Zsombor Egri on 2014-09-09: prereq
1240. By Zsombor Egri on 2014-09-11: prereq
1241. By Zsombor Egri on 2014-09-11: prereq
1242. By Zsombor Egri on 2014-09-15: prereq
1243. By Zsombor Egri on 2014-09-15: prereq
1244. By Zsombor Egri on 2014-09-15: prereq
1245. By Zsombor Egri on 2014-09-15: prereq
1246. By Zsombor Egri on 2014-09-16: prereq
1247. By Zsombor Egri on 2014-09-17: prereq
1248. By Zsombor Egri on 2014-09-17: prereq
1249. By Zsombor Egri on 2014-09-17: prereq
1250. By Zsombor Egri on 2014-09-17: prereq
1251. By Zsombor Egri on 2014-09-18: prereq sync
1252. By Zsombor Egri on 2014-09-19: prereq sync
1253. By Zsombor Egri on 2014-09-24: prereq sync
1254. By Zsombor Egri on 2014-09-25: prereq sync
1255. By Zsombor Egri on 2014-09-25: fixing test cases
1256. By Zsombor Egri on 2014-09-25: tests fixed
1257. By Zsombor Egri on 2014-09-25: naming fix
1258. By Zsombor Egri on 2014-09-29: prereq sync
1259. By Zsombor Egri on 2014-10-02: prereq sync
1260. By Zsombor Egri on 2014-10-13: prereq sync
1261. By Zsombor Egri on 2014-10-20: prereq sync
1262. By Zsombor Egri on 2014-10-22: prereq sync
1263. By Zsombor Egri on 2014-10-22: prereq sync
1264. By Zsombor Egri on 2014-10-23: prereq sync
1265. By Zsombor Egri on 2014-10-23: prereq sync
1266. By Zsombor Egri on 2014-10-24: prereq sync
1267. By Zsombor Egri on 2014-10-30: prereq sync
1268. By Zsombor Egri on 2014-10-30: test fixed
1269. By Zsombor Egri on 2014-10-30: prereq sync
1270. By Zsombor Egri on 2014-11-04: prereq sync
1271. By Zsombor Egri on 2014-11-07: prereq sync
1272. By Zsombor Egri on 2014-11-07: prereq sync
1273. By Zsombor Egri on 2014-11-07: test fix ongoing
1274. By Zsombor Egri on 2014-11-07: based on Flickable's thinking, rename data and children properties to listItemData/listItemChildren to not to interfere with the original properties. This affects testing as well, as by using the original property names the QML children or data lookup cannot find the panelItem anymore.
1275. By Zsombor Egri on 2014-11-07: API updated
1276. By Zsombor Egri on 2014-11-10: prereq sync
1277. By Zsombor Egri on 2014-11-12: prereq sync
1278. By Zsombor Egri on 2014-11-12: prereq sync
1279. By Zsombor Egri on 2014-11-17: prereq sync
1280. By Zsombor Egri on 2014-11-17: prereq sync
1281. By Zsombor Egri on 2014-11-18: prereq sync
1282. By Zsombor Egri on 2014-11-19: prereq sync
1283. By Zsombor Egri on 2014-11-20: prereq sync
1284. By Zsombor Egri on 2014-11-24: prereq sync
1285. By Zsombor Egri on 2014-11-24: prereq sync
1286. By Zsombor Egri on 2014-11-24: prereq sync
1287. By Zsombor Egri on 2014-11-25: prereq sync
1288. By Zsombor Egri on 2014-11-25: options renamed to actions

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file 'modules/Ubuntu/Components/ListItemPanel.qml'
 --- modules/Ubuntu/Components/ListItemPanel.qml	2014-09-11 11:53:54 +0000
 +++ modules/Ubuntu/Components/ListItemPanel.qml	2014-09-11 11:53:54 +0000
@@ -39,6 +39,11 @@
        */
      property var optionList
++    /*
++      Emitted when action is triggered
++      */
++    signal selected()
++
      anchors {
          left: contentItem ? (leadingPanel ? undefined : contentItem.right) : undefined
          right: contentItem ? (leadingPanel ? contentItem.left : undefined) : undefined
@@ -73,6 +78,7 @@
                      top: parent.top
                      bottom: parent.bottom
+                 }
++                onTriggered: panel.selected()
                  Loader {
                      id: delegateLoader
 === modified file 'modules/Ubuntu/Components/plugin/uclistitemoptions.cpp'
 --- modules/Ubuntu/Components/plugin/uclistitemoptions.cpp	2014-09-11 11:53:54 +0000
 +++ modules/Ubuntu/Components/plugin/uclistitemoptions.cpp	2014-09-11 11:53:54 +0000
@@ -86,6 +86,7 @@
      _this->leading = leading;
      _this->panelItem->setProperty("leadingPanel", leading);
      _this->panelItem->setParentItem(listItem);
++    QObject::connect(_this->panelItem, SIGNAL(selected()), _this->panelItem->parentItem(), SLOT(_q_rebound()));
      _this->connected = true;
      return true;
+ }
@@ -96,6 +97,8 @@
      if (!_this || !_this->panelItem || !_this->panelItem->parentItem()) {
          return;
+     }
++
++    QObject::disconnect(_this->panelItem, SIGNAL(selected()), _this->panelItem->parentItem(), SLOT(_q_rebound()));
      _this->panelItem->setParentItem(0);
      _this->connected = false;
      _this->leading = false;
 === modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
 --- tests/unit_x11/tst_components/tst_listitem.qml	2014-09-11 11:53:54 +0000
 +++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-11 11:53:54 +0000
@@ -315,5 +315,32 @@
              waitForRendering(data.item, 400);
              tryCompareFunction(function(){ return listView.interactive; }, true, 1000);
+         }
++
++        function test_selecting_option_rebounds_data() {
++            var item0 = findChild(listView, "listItem0");
++            return [
++                {tag: "With mouse", item: item0, pos: centerOf(item0), dx: units.gu(20), options: item0.leadingOptions, select: "list_option_0", mouse: true},
++                {tag: "With touch", item: item0, pos: centerOf(item0), dx: units.gu(20), options: item0.leadingOptions, select: "list_option_0", mouse: false},
++            ]
++        }
++        function test_selecting_option_rebounds(data) {
++            listView.positionViewAtBeginning();
++            if (data.mouse) {
++                flick(data.item, data.pos.x, data.pos.y, data.dx, 0);
++            } else {
++                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, 0));
++            }
++            waitForRendering(data.item, 800);
++            var selectedOption = findChild(data.options.panelItem, data.select);
++            verify(selectedOption, "Cannot select option " + data.select);
++            // dismiss
++            if (data.mouse) {
++                mouseClick(selectedOption, centerOf(selectedOption).x, centerOf(selectedOption).y);
++            } else {
++                TestExtras.touchClick(0, selectedOption, centerOf(selectedOption));
++            }
++            waitForRendering(data.item, 400);
++            tryCompareFunction(function(){ return data.item.contentItem.x; }, 0, 1000);
++        }
+     }
+ }