@@ -16,7 +16,6 @@
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.3 as ListItems
20import Unity.Launcher 0.1
19import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 1.3
20import Ubuntu.Components.Popups 1.3
22import "../Components/ListItems"
21import "../Components/ListItems"
@@ -780,12 +779,28 @@ Rectangle {
780 id: popoverRepeater
779 id: popoverRepeater
781 model: quickList.model
780 model: quickList.model
783− ListItems.Standard {
782+ ListItem {
784 objectName: "quickListEntry" + index
783 objectName: "quickListEntry" + index
785− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
786− highlightWhenPressed: model.clickable
787 selected: index === quickList.selectedIndex
784 selected: index === quickList.selectedIndex
788− __foregroundColor: "white"
785+ height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin
786+ color: model.clickable ? (selected ? theme.palette.highlighted.background : "transparent") : theme.palette.disabled.background
787+ highlightColor: !model.clickable ? quickList.color : undefined // make disabled items visually unclickable
788+ divider.colorFrom: UbuntuColors.inkstone
789+ divider.colorTo: UbuntuColors.inkstone
793+ anchors.fill: parent
794+ anchors.leftMargin: units.gu(4) // 2 GU for checkmark
795+ anchors.rightMargin: units.gu(2)
796+ anchors.topMargin: units.gu(2)
797+ anchors.bottomMargin: units.gu(2)
798+ verticalAlignment: Label.AlignVCenter
800+ fontSize: index == 0 ? "medium" : "small"
801+ font.weight: index == 0 ? Font.Medium : Font.Light
802+ color: model.clickable ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
790 onClicked: {
805 onClicked: {
791 if (!model.clickable) {
806 if (!model.clickable) {