@@ -25,7 +25,7 @@ import "../Components/"
26Rectangle {
26Rectangle {
28− color: "#E0292929"
28+ color: Qt.rgba(17/255, 17/255, 17/255, 0.95) // #111111, 95%
30 rotation: inverted ? 180 : 0
30 rotation: inverted ? 180 : 0
@@ -633,9 +633,10 @@ Rectangle {
633 id: quickListShape
633 id: quickListShape
634 objectName: "quickListShape"
634 objectName: "quickListShape"
635 anchors.fill: quickList
635 anchors.fill: quickList
636− opacity: quickList.state === "open" ? 0.8 : 0
636+ opacity: quickList.state === "open" ? 0.95 : 0 // FIXME: should this have some transparency at all?
637 visible: opacity > 0
637 visible: opacity > 0
638 rotation: root.rotation
638 rotation: root.rotation
639+ aspect: UbuntuShape.Flat
640 Behavior on opacity {
641 Behavior on opacity {
641 UbuntuNumberAnimation {}
642 UbuntuNumberAnimation {}
@@ -696,7 +697,7 @@ Rectangle {
696 Rectangle {
697 Rectangle {
697 id: quickList
698 id: quickList
698 objectName: "quickList"
699 objectName: "quickList"
699− color: "#f5f5f5"
700+ color: UbuntuColors.jet
700 // Because we're setting left/right anchors depending on orientation, it will break the
701 // Because we're setting left/right anchors depending on orientation, it will break the
701 // width setting after rotating twice. This makes sure we also re-apply width on rotation
702 // width setting after rotating twice. This makes sure we also re-apply width on rotation
702 width: root.inverted ? units.gu(30) : units.gu(30)
703 width: root.inverted ? units.gu(30) : units.gu(30)
@@ -767,14 +768,10 @@ Rectangle {
767 quickList.state = "open";
768 quickList.state = "open";
770− StyledItem {
771+ Item {
771 width: parent.width
772 width: parent.width
772 height: quickListColumn.height
773 height: quickListColumn.height
774− theme: ThemeSettings {
775− name: "Ubuntu.Components.Themes.Ambiance"
779 id: quickListColumn
776 id: quickListColumn
780 width: parent.width
777 width: parent.width
@@ -784,11 +781,23 @@ Rectangle {
784 id: popoverRepeater
781 id: popoverRepeater
785 model: quickList.model
782 model: quickList.model
787− ListItems.Standard {
784+ ListItem {
788 objectName: "quickListEntry" + index
785 objectName: "quickListEntry" + index
789− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
790− highlightWhenPressed: model.clickable
791 selected: index === quickList.selectedIndex
786 selected: index === quickList.selectedIndex
787+ divider.colorFrom: UbuntuColors.slate
788+ divider.colorTo: UbuntuColors.slate
789+ highlightColor: !model.clickable ? quickList.color : undefined
792+ anchors.fill: parent
793+ anchors.leftMargin: units.gu(4) // 2 GU for an optional checkmark
794+ anchors.rightMargin: units.gu(1)
795+ verticalAlignment: Label.AlignVCenter
797+ color: model.clickable ? "white" /*theme.palette.normal.backgroundText*/ : theme.palette.normal.backgroundSecondaryText
798+ //fontSize: model.clickable && index == 0 ? "medium" : "small" // FIXME too small
799+ font.weight: index == 0 ? Font.Medium : Font.Light
793 onClicked: {
802 onClicked: {
794 if (!model.clickable) {
803 if (!model.clickable) {