Merge lp:~tpeeters/ubuntu-ui-toolkit/fix1205094 into lp:ubuntu-ui-toolkit

[Tim Peeters]

Quick fix, completely untested. Might mess up apps with list items that do not use popovers. Have a look to see if you can use this code and it doesn't break anything.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:729
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/440
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2811/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2381

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/583/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

ugly, but there are not so many nicer ways to detect this...

review: Approve

=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2013-07-04 21:36:23 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2013-08-29 18:48:44 +0000
@@ -23,8 +23,16 @@
     property bool selected: false
     property bool secondary: false
 
+    // FIXME: very ugly hack to detect whether the list item is inside a Popover
+    property bool overlay: isInsideOverlay(label)
+    function isInsideOverlay(item) {
+        if (!item.parent) return false;
+        return item.parent.hasOwnProperty("pointerTarget") || label.isInsideOverlay(item.parent)
+    }
+
     fontSize: "medium"
     elide: Text.ElideRight
-    color: selected ? UbuntuColors.orange : secondary ? Theme.palette.normal.backgroundText : Theme.palette.selected.backgroundText
+    color: selected ? UbuntuColors.orange : secondary ? overlay ? Theme.palette.normal.overlayText : Theme.palette.normal.backgroundText
+                                                      : overlay ? Theme.palette.selected.overlayText : Theme.palette.selected.backgroundText
     opacity: label.enabled ? 1.0 : 0.5
 }