git.iko.soy/unity8
on xenial help sign in
rework launcher quicklist visuals to fit new design Fixes: 1368660
9487d09Michael Zanetti
qml/Launcher/LauncherPanel.qml+16−15
compare with xenial
unifiedsplit
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.3
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19−import Ubuntu.Components.ListItems 0.1 as ListItems
19+import Ubuntu.Components.ListItems 1.0 as ListItems
20import Unity.Launcher 0.1
20import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 0.1
21import Ubuntu.Components.Popups 0.1
22import "../Components/ListItems"
22import "../Components/ListItems"
@@ -479,7 +479,7 @@ Rectangle {
479 id: quickListShape
479 id: quickListShape
480 objectName: "quickListShape"
480 objectName: "quickListShape"
481 anchors.fill: quickList
481 anchors.fill: quickList
482− opacity: quickList.state === "open" ? 0.8 : 0
482+ opacity: quickList.state === "open" ? 0.96 : 0
483 visible: opacity > 0
483 visible: opacity > 0
484 rotation: root.rotation
484 rotation: root.rotation
485
485
@@ -491,15 +491,15 @@ Rectangle {
491
491
492 Image {
492 Image {
493 anchors {
493 anchors {
494− right: parent.left
494+ left: parent.left
495− rightMargin: -units.dp(4)
495+ leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
496 verticalCenter: parent.verticalCenter
496 verticalCenter: parent.verticalCenter
497− verticalCenterOffset: -quickList.offset
497+ verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1)
498 }
498 }
499 height: units.gu(1)
499 height: units.gu(1)
500 width: units.gu(2)
500 width: units.gu(2)
501 source: "graphics/quicklist_tooltip.png"
501 source: "graphics/quicklist_tooltip.png"
502− rotation: 90
502+ rotation: quickList.offset > 0 ? 0 : 180
503 }
503 }
504
504
505 InverseMouseArea {
505 InverseMouseArea {
@@ -515,16 +515,16 @@ Rectangle {
515 Rectangle {
515 Rectangle {
516 id: quickList
516 id: quickList
517 objectName: "quickList"
517 objectName: "quickList"
518− color: "#221e1c"
518+ color: "#f5f5f5"
519 width: units.gu(30)
519 width: units.gu(30)
520 height: quickListColumn.height
520 height: quickListColumn.height
521 visible: quickListShape.visible
521 visible: quickListShape.visible
522 anchors {
522 anchors {
523− left: root.inverted ? undefined : parent.right
523+ left: root.inverted ? undefined : parent.left
524− right: root.inverted ? parent.left : undefined
524+ right: root.inverted ? parent.right : undefined
525 margins: units.gu(1)
525 margins: units.gu(1)
526 }
526 }
527− y: itemCenter - (height / 2) + offset
527+ y: itemCenter + offset
528 rotation: root.rotation
528 rotation: root.rotation
529
529
530 property var model
530 property var model
@@ -533,8 +533,9 @@ Rectangle {
533
533
534 // internal
534 // internal
535 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
535 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
536− property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
536+ property int offset: itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
537+ -(item.height/2) - height - units.gu(.5) :
537− itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
538+ (item.height/2) + units.gu(.5)
538
539
539 Column {
540 Column {
540 id: quickListColumn
541 id: quickListColumn
@@ -553,7 +554,7 @@ Rectangle {
553 // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
554 // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
554 // ListItems don't know that they are sitting in a themed Popover where the color
555 // ListItems don't know that they are sitting in a themed Popover where the color
555 // needs to be inverted.
556 // needs to be inverted.
556− __foregroundColor: Theme.palette.selected.backgroundText
557+ __foregroundColor: "black"
557
558
558 onClicked: {
559 onClicked: {
559 if (!model.clickable) {
560 if (!model.clickable) {
qml/Launcher/graphics/quicklist_tooltip@30.png

Binary file not shown.

tests/qmltests/Launcher/tst_Launcher.qml+6−6
@@ -431,20 +431,20 @@ Item {
431 }
431 }
432
432
433 // Doing longpress
433 // Doing longpress
434− mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
434+ mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2);
435− tryCompare(quickListShape, "opacity", 0.8)
435+ tryCompare(quickListShape, "opacity", 0.96);
436 mouseRelease(draggedItem);
436 mouseRelease(draggedItem);
437
437
438− verify(quickList.y >= units.gu(1))
438+ verify(quickList.y >= units.gu(1));
439− verify(quickList.y + quickList.height + units.gu(1) <= launcher.height)
439+ verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);
440
440
441 // Click somewhere in the empty space to dismiss the quicklist
441 // Click somewhere in the empty space to dismiss the quicklist
442 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
442 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
443− tryCompare(quickListShape, "visible", false)
443+ tryCompare(quickListShape, "visible", false);
444
444
445 // Click somewhere in the empty space to dismiss the launcher
445 // Click somewhere in the empty space to dismiss the launcher
446 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
446 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
447− waitUntilLauncherDisappears()
447+ waitUntilLauncherDisappears();
448 }
448 }
449
449
450 function test_quicklist_click_data() {
450 function test_quicklist_click_data() {