Ubuntu UI Toolkit

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

67-fix-disabled-listitem
Merge into staging

Proposed by Zsombor Egri on 2014-09-08

Status:	Superseded
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~zsombi/ubuntu-ui-toolkit/65-last-divider-invisible
Diff against target:	121 lines (+51/-0) 4 files modified modules/Ubuntu/Components/plugin/uclistitem.cpp (+19/-0) modules/Ubuntu/Components/plugin/uclistitem.h (+1/-0) modules/Ubuntu/Components/plugin/uclistitem_p.h (+2/-0) tests/unit_x11/tst_components/tst_listitem.qml (+29/-0)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem
Related bugs:	Link a bug report
Related blueprints:	SDK: Design a new ListItem and layouts (Undefined)

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-11
Ubuntu SDK team		2014-09-08	Pending
Review via email: mp+233668@code.launchpad.net

Commit message

ListItem dimmed when disabled.

lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem updated on 2014-09-08

1243. By Zsombor Egri on 2014-09-08: fix provided

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1000/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem updated on 2014-09-08

1244. By Zsombor Egri on 2014-09-08: prereq
1245. By Zsombor Egri on 2014-09-08: fixing test count

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-08:

PASSED: Continuous integration, rev:1245
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1004/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/836
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/836/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5841
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5841/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12853

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1004/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem updated on 2014-09-09

1246. By Zsombor Egri on 2014-09-09: prereq
1247. By Zsombor Egri on 2014-09-09: prereq

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-09:

PASSED: Continuous integration, rev:1246
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1010/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/842
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5891
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5891/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12936

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1010/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1013/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem updated on 2014-09-11

1248. By Zsombor Egri on 2014-09-11: prereq
1249. By Zsombor Egri on 2014-09-11: prereq
1250. By Zsombor Egri on 2014-09-11: prereq

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1024/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1027/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/67-fix-disabled-listitem updated on 2014-12-02

1251. By Zsombor Egri on 2014-09-15: prereq
1252. By Zsombor Egri on 2014-09-15: prereq
1253. By Zsombor Egri on 2014-09-15: prereq
1254. By Zsombor Egri on 2014-09-16: prereq
1255. By Zsombor Egri on 2014-09-17: prereq
1256. By Zsombor Egri on 2014-09-17: prereq
1257. By Zsombor Egri on 2014-09-17: prereq
1258. By Zsombor Egri on 2014-09-17: prereq
1259. By Zsombor Egri on 2014-09-17: prereq
1260. By Zsombor Egri on 2014-09-18: prereq
1261. By Zsombor Egri on 2014-09-18: prereq sync
1262. By Zsombor Egri on 2014-09-19: prereq sync
1263. By Zsombor Egri on 2014-09-24: prereq sync
1264. By Zsombor Egri on 2014-09-25: prereq sync
1265. By Zsombor Egri on 2014-09-28: prereq sync
1266. By Zsombor Egri on 2014-09-29: prereq sync
1267. By Zsombor Egri on 2014-10-02: prereq sync
1268. By Zsombor Egri on 2014-10-13: prereq sync
1269. By Zsombor Egri on 2014-10-20: prereq sync
1270. By Zsombor Egri on 2014-10-22: prereq sync
1271. By Zsombor Egri on 2014-10-22: prereq sync
1272. By Zsombor Egri on 2014-10-24: prereq sync
1273. By Zsombor Egri on 2014-10-29: prereq sync
1274. By Zsombor Egri on 2014-10-29: prereq sync
1275. By Zsombor Egri on 2014-10-29: disabled action shown dimmed
1276. By Zsombor Egri on 2014-10-31: prereq sync
1277. By Zsombor Egri on 2014-10-31: property assignment duplicity fixed
1278. By Zsombor Egri on 2014-10-31: prereq sync
1279. By Zsombor Egri on 2014-11-03: prereq sync
1280. By Zsombor Egri on 2014-11-04: prereq sync
1281. By Zsombor Egri on 2014-11-12: prereq sync
1282. By Zsombor Egri on 2014-11-12: removed connection restored
1283. By Zsombor Egri on 2014-11-12: prereq sync
1284. By Zsombor Egri on 2014-11-17: prereq sync
1285. By Zsombor Egri on 2014-11-18: prereq sync
1286. By Zsombor Egri on 2014-11-19: prereq sync
1287. By Zsombor Egri on 2014-11-20: prereq sync
1288. By Zsombor Egri on 2014-11-24: prereq sync
1289. By Zsombor Egri on 2014-11-25: prereq sync
1290. By Zsombor Egri on 2014-11-25: prereq sync
1291. By Zsombor Egri on 2014-11-25: prereq sync
1292. By Zsombor Egri on 2014-11-25: prereq sync
1293. By Zsombor Egri on 2014-11-28: prereq sync
1294. By Zsombor Egri on 2014-12-01: prereq sync
1295. By Zsombor Egri on 2014-12-01: prereq sync
1296. By Zsombor Egri on 2014-12-01: rebind when swiped over the actions panel
1297. By Zsombor Egri on 2014-12-01: remove wrong commit
1298. By Zsombor Egri on 2014-12-01: prereq sync
1299. By Zsombor Egri on 2014-12-02: typo fix
1300. By Zsombor Egri on 2014-12-02: opacity handling removed
1301. By Zsombor Egri on 2014-12-02: some leftovers removed

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/plugin/uclistitem.cpp'
 --- modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-11 12:07:09 +0000
 +++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-11 12:07:10 +0000
@@ -251,6 +251,7 @@
      , xAxisMoveThresholdGU(1.5)
      , reboundAnimation(0)
      , flickableInteractive(0)
++    , disabledOpacity(0)
      , contentItem(new UCListItemContent)
      , divider(new UCListItemDivider)
      , leadingOptions(0)
@@ -260,6 +261,7 @@
  UCListItemPrivate::~UCListItemPrivate()
+ {
      delete flickableInteractive;
++    delete disabledOpacity;
+ }
  void UCListItemPrivate::init()
@@ -282,6 +284,9 @@
      QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_updateSize()));
      _q_updateSize();
++    // watch enabledChanged()
++    QObject::connect(q, SIGNAL(enabledChanged()), q, SLOT(_q_dimmDisabled()), Qt::DirectConnection);
++
      // create rebound animation
      UCUbuntuAnimation animationCodes;
      reboundAnimation = new QQuickPropertyAnimation(q);
@@ -300,6 +305,20 @@
      q->setFiltersChildMouseEvents(true);
+ }
++void UCListItemPrivate::_q_dimmDisabled()
++{
++    Q_Q(UCListItem);
++    if (q->isEnabled()) {
++        PropertyChange::restore(disabledOpacity);
++    } else if (opacity() != 0.5) {
++        // this is the first time we need to create the property change
++        if (!disabledOpacity) {
++            disabledOpacity = new PropertyChange(q, "opacity");
++        }
++        PropertyChange::setValue(disabledOpacity, 0.5);
++    }
++}
++
  void UCListItemPrivate::_q_rebound()
+ {
      setPressed(false);
 === modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
 --- modules/Ubuntu/Components/plugin/uclistitem.h	2014-09-11 12:07:09 +0000
 +++ modules/Ubuntu/Components/plugin/uclistitem.h	2014-09-11 12:07:10 +0000
@@ -71,6 +71,7 @@
      Q_DECLARE_PRIVATE(UCListItem)
      QQmlListProperty<QObject> data();
      QQmlListProperty<QQuickItem> children();
++    Q_PRIVATE_SLOT(d_func(), void _q_dimmDisabled())
      Q_PRIVATE_SLOT(d_func(), void _q_rebound())
      Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
      Q_PRIVATE_SLOT(d_func(), void _q_completeRebinding())
 === modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
 --- modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-11 12:07:09 +0000
 +++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-11 12:07:10 +0000
@@ -45,6 +45,7 @@
      // override setFocusable()
      void setFocusable();
++    void _q_dimmDisabled();
      void _q_rebound();
      void _q_updateSize();
      void _q_completeRebinding();
@@ -70,6 +71,7 @@
      QPointer<QQuickFlickable> flickable;
      QQuickPropertyAnimation *reboundAnimation;
      PropertyChange *flickableInteractive;
++    PropertyChange *disabledOpacity;
      UCListItemContent *contentItem;
      UCListItemDivider *divider;
      UCListItemOptions *leadingOptions;
 === modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
 --- tests/unit_x11/tst_components/tst_listitem.qml	2014-09-11 12:07:09 +0000
 +++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-11 12:07:10 +0000
@@ -446,5 +446,34 @@
              actionSpy.wait();
              compare(action.param, data.result, "Action parameter differs");
+         }
++
++        SignalSpy {
++            id: panelItemSpy
++            signalName: "onXChanged"
++        }
++
++        function test_disabled_item_locked_data() {
++            var item0 = findChild(listView, "listItem0");
++            return [
++                // drag same amount as height is
++                {tag: "Simple item, leading", item: testItem, enabled: false, dx: testItem.height},
++                {tag: "Simple item, trailing", item: testItem, enabled: false, dx: -testItem.height},
++                {tag: "ListView item, leading", item: item0, enabled: false, dx: item0.height},
++                {tag: "ListView item, trailing", item: item0, enabled: false, dx: -item0.height},
++            ];
++        }
++        function test_disabled_item_locked(data) {
++            var oldEnabled = data.item.enabled;
++            panelItemSpy.clear();
++            panelItemSpy.target = data.item;
++            data.item.enabled = false;
++            // tug
++            flick(data.item.contentItem, centerOf(data.item.contentItem).x, centerOf(data.item.contentItem).y, data.dx, 0);
++            compare(panelItemSpy.count, 0, "Item had been tugged despite being disabled!");
++            // check opacity
++            fuzzyCompare(data.item.opacity, 0.5, 0.1, "Disabled item must be 50% transparent");
++            //cleanup
++            data.item.enabled = oldEnabled;
++        }
+     }
+ }

Ubuntu UI Toolkit

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

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers