@@ -16,16 +16,14 @@
1616
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.3 as ListItems
2019import Unity.Launcher 0.1
2120import Ubuntu.Components.Popups 1.3
22−import GlobalShortcut 1.0
2321import "../Components/ListItems"
2422import "../Components/"
2523
2624Rectangle {
2725 id: root
28− color: "#E0292929"
26+ color: "#F2111111"
2927
3028 rotation: inverted ? 180 : 0
3129
@@ -634,9 +632,10 @@ Rectangle {
634632 id: quickListShape
635633 objectName: "quickListShape"
636634 anchors.fill: quickList
637− opacity: quickList.state === "open" ? 0.8 : 0
635+ opacity: quickList.state === "open" ? 0.95 : 0
638636 visible: opacity > 0
639637 rotation: root.rotation
638+ aspect: UbuntuShape.Flat
640639
641640 Behavior on opacity {
642641 UbuntuNumberAnimation {}
@@ -697,7 +696,7 @@ Rectangle {
697696 Rectangle {
698697 id: quickList
699698 objectName: "quickList"
700− color: "#f5f5f5"
699+ color: theme.palette.normal.background
701700 // Because we're setting left/right anchors depending on orientation, it will break the
702701 // width setting after rotating twice. This makes sure we also re-apply width on rotation
703702 width: root.inverted ? units.gu(30) : units.gu(30)
@@ -768,14 +767,10 @@ Rectangle {
768767 quickList.state = "open";
769768 }
770769
771− StyledItem {
770+ Item {
772771 width: parent.width
773772 height: quickListColumn.height
774773
775− theme: ThemeSettings {
776− name: "Ubuntu.Components.Themes.Ambiance"
777− }
778−
779774 Column {
780775 id: quickListColumn
781776 width: parent.width
@@ -785,11 +780,28 @@ Rectangle {
785780 id: popoverRepeater
786781 model: quickList.model
787782
788− ListItems.Standard {
783+ ListItem {
789784 objectName: "quickListEntry" + index
790− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
791− highlightWhenPressed: model.clickable
792785 selected: index === quickList.selectedIndex
786+ height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin
787+ color: model.clickable ? (selected ? theme.palette.highlighted.background : "transparent") : theme.palette.disabled.background
788+ highlightColor: !model.clickable ? quickList.color : undefined // make disabled items visually unclickable
789+ divider.colorFrom: UbuntuColors.inkstone
790+ divider.colorTo: UbuntuColors.inkstone
791+
792+ Label {
793+ id: label
794+ anchors.fill: parent
795+ anchors.leftMargin: units.gu(3) // 2 GU for checkmark, 3 GU total
796+ anchors.rightMargin: units.gu(2)
797+ anchors.topMargin: units.gu(2)
798+ anchors.bottomMargin: units.gu(2)
799+ verticalAlignment: Label.AlignVCenter
800+ text: model.label
801+ fontSize: index == 0 ? "medium" : "small"
802+ font.weight: index == 0 ? Font.Medium : Font.Light
803+ color: model.clickable ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
804+ }
793805
794806 onClicked: {
795807 if (!model.clickable) {