Merge lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem into lp:~zsombi/ubuntu-ui-toolkit/listitem-master

Proposed by Zsombor Egri
Status: Merged
Approved by: Tim Peeters
Approved revision: 1301
Merged at revision: 1279
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem
Merge into: lp:~zsombi/ubuntu-ui-toolkit/listitem-master
Prerequisite: lp:~zsombi/ubuntu-ui-toolkit/65-last-divider-invisible
Diff against target: 21 lines (+3/-1)
1 file modified
modules/Ubuntu/Components/plugin/uclistitem.cpp (+3/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem
Reviewer Review Type Date Requested Status
Tim Peeters Approve
Zsombor Egri continuous-integration Approve
Cris Dywan Pending
Review via email: mp+235177@code.launchpad.net

Commit message

Fix: listen on flickable's movementStarted() signal also while swiped over the visualized leading/trailing actions.

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Previously approved by Christian.

review: Approve (continuous-integration)
1262. By Zsombor Egri

prereq sync

1263. By Zsombor Egri

prereq sync

1264. By Zsombor Egri

prereq sync

1265. By Zsombor Egri

prereq sync

1266. By Zsombor Egri

prereq sync

1267. By Zsombor Egri

prereq sync

1268. By Zsombor Egri

prereq sync

1269. By Zsombor Egri

prereq sync

1270. By Zsombor Egri

prereq sync

1271. By Zsombor Egri

prereq sync

1272. By Zsombor Egri

prereq sync

1273. By Zsombor Egri

prereq sync

1274. By Zsombor Egri

prereq sync

1275. By Zsombor Egri

disabled action shown dimmed

1276. By Zsombor Egri

prereq sync

1277. By Zsombor Egri

property assignment duplicity fixed

1278. By Zsombor Egri

prereq sync

1279. By Zsombor Egri

prereq sync

1280. By Zsombor Egri

prereq sync

1281. By Zsombor Egri

prereq sync

1282. By Zsombor Egri

removed connection restored

1283. By Zsombor Egri

prereq sync

1284. By Zsombor Egri

prereq sync

1285. By Zsombor Egri

prereq sync

1286. By Zsombor Egri

prereq sync

1287. By Zsombor Egri

prereq sync

1288. By Zsombor Egri

prereq sync

1289. By Zsombor Egri

prereq sync

1290. By Zsombor Egri

prereq sync

1291. By Zsombor Egri

prereq sync

1292. By Zsombor Egri

prereq sync

1293. By Zsombor Egri

prereq sync

1294. By Zsombor Egri

prereq sync

1295. By Zsombor Egri

prereq sync

1296. By Zsombor Egri

rebind when swiped over the actions panel

1297. By Zsombor Egri

remove wrong commit

1298. By Zsombor Egri

prereq sync

Revision history for this message
Tim Peeters (tpeeters) wrote :

dim should have only 1 m

review: Needs Fixing
1299. By Zsombor Egri

typo fix

1300. By Zsombor Egri

opacity handling removed

1301. By Zsombor Egri

some leftovers removed

Revision history for this message
Tim Peeters (tpeeters) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
2--- modules/Ubuntu/Components/plugin/uclistitem.cpp 2014-12-02 14:48:53 +0000
3+++ modules/Ubuntu/Components/plugin/uclistitem.cpp 2014-12-02 14:48:55 +0000
4@@ -135,7 +135,7 @@
5 // restore flickable's interactive and cleanup
6 listItem->attachedProperties->disableInteractive(item, false);
7 // no need to listen flickables any longer
8- listItem->attachedProperties->listenToRebind(item, false);
9+ listItem->listenToRebind(false);
10 }
11 // disconnect actions
12 listItem->grabPanel(listItem->leadingActions, false);
13@@ -972,6 +972,8 @@
14 if (child->isEnabled() && (child->acceptedMouseButtons() & mouse->button()) && !qobject_cast<QQuickText*>(child)) {
15 Q_D(UCListItem);
16 d->suppressClick = true;
17+ // listen for flickable to be able to rebind if movement started there!
18+ d->listenToRebind(true);
19 }
20 } else if (type == QEvent::MouseButtonRelease) {
21 Q_D(UCListItem);

Subscribers

People subscribed via source and target branches

to all changes: