git.iko.soy/unity8
on xenial help sign in
fix issues from review
commitfb4af0b4bbd428d60a4316b1de0561f937ca4877 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 10 Oct 2014, 16:59 (12 years ago) parent72aefad
2 files changed+15−10
compare with xenial
unifiedsplit
qml/Launcher/LauncherPanel.qml+6−1 tests/qmltests/Launcher/tst_Launcher.qml+9−9
qml/Launcher/LauncherPanel.qml+6−1
@@ -483,7 +483,7 @@ Rectangle {
483483 id: quickListShape
484484 objectName: "quickListShape"
485485 anchors.fill: quickList
486− opacity: quickList.state === "open" ? 0.95 : 0
486+ opacity: quickList.state === "open" ? 0.96 : 0
487487 visible: opacity > 0
488488 rotation: root.rotation
489489
@@ -555,6 +555,11 @@ Rectangle {
555555 text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
556556 highlightWhenPressed: model.clickable
557557
558+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
559+ // ListItems don't know that they are sitting in a themed Popover where the color
560+ // needs to be inverted.
561+ __foregroundColor: Theme.palette.normal.highlightText
562+
558563 onClicked: {
559564 if (!model.clickable) {
560565 return;
tests/qmltests/Launcher/tst_Launcher.qml+9−9
@@ -402,9 +402,9 @@ Item {
402402
403403 function test_quicklist_positioning(data) {
404404 revealer.dragLauncherIntoView();
405− var quickList = findChild(launcher, "quickList")
406− var draggedItem = findChild(launcher, "launcherDelegate" + data.itemIndex)
407− var quickListShape = findChild(launcher, "quickListShape")
405+ var quickList = findChild(launcher, "quickList");
406+ var draggedItem = findChild(launcher, "launcherDelegate" + data.itemIndex);
407+ var quickListShape = findChild(launcher, "quickListShape");
408408
409409 // Position launcher to where we need it
410410 var listView = findChild(launcher, "launcherListView");
@@ -415,20 +415,20 @@ Item {
415415 }
416416
417417 // Doing longpress
418− mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
419− tryCompare(quickListShape, "opacity", 0.95)
418+ mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2);
419+ tryCompare(quickListShape, "opacity", 0.96);
420420 mouseRelease(draggedItem);
421421
422− verify(quickList.y >= units.gu(1))
423− verify(quickList.y + quickList.height + units.gu(1) <= launcher.height)
422+ verify(quickList.y >= units.gu(1));
423+ verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);
424424
425425 // Click somewhere in the empty space to dismiss the quicklist
426426 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
427− tryCompare(quickListShape, "visible", false)
427+ tryCompare(quickListShape, "visible", false);
428428
429429 // Click somewhere in the empty space to dismiss the launcher
430430 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
431− revealer.waitUntilLauncherDisappears()
431+ revealer.waitUntilLauncherDisappears();
432432 }
433433
434434 function test_quicklist_click_data() {