git.iko.soy/unity8
on xenial help sign in
revert to ListItems.Standard to restore kbd navigation
4a13c49Lukáš Tinkl
qml/Launcher/Launcher.qml−1
compare with xenial
unifiedsplit
@@ -19,7 +19,6 @@ import "../Components"
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Ubuntu.Gestures 0.1
20import Ubuntu.Gestures 0.1
21import Unity.Launcher 0.1
21import Unity.Launcher 0.1
22−import GlobalShortcut 1.0
23
22
24FocusScope {
23FocusScope {
25 id: root
24 id: root
qml/Launcher/LauncherPanel.qml+4−17
@@ -19,7 +19,6 @@ import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.3 as ListItems
19import Ubuntu.Components.ListItems 1.3 as ListItems
20import Unity.Launcher 0.1
20import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.Popups 1.3
22−import GlobalShortcut 1.0
23import "../Components/ListItems"
22import "../Components/ListItems"
24import "../Components/"
23import "../Components/"
25
24
@@ -781,24 +780,12 @@ Rectangle {
781 id: popoverRepeater
780 id: popoverRepeater
782 model: quickList.model
781 model: quickList.model
783
782
784− ListItem {
783+ ListItems.Standard {
785 objectName: "quickListEntry" + index
784 objectName: "quickListEntry" + index
785+ text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
786+ highlightWhenPressed: model.clickable
786 selected: index === quickList.selectedIndex
787 selected: index === quickList.selectedIndex
787− // hide the divider after last item
788+ __foregroundColor: "white"
788− divider.colorFrom: index == popoverRepeater.count-1 ? quickList.color : UbuntuColors.slate
789− divider.colorTo: index == popoverRepeater.count-1 ? quickList.color : UbuntuColors.slate
790− highlightColor: !model.clickable ? quickList.color : undefined
791−
792− Label {
793− anchors.fill: parent
794− anchors.leftMargin: units.gu(4) // 2 GU for an optional checkmark
795− anchors.rightMargin: units.gu(1)
796− verticalAlignment: Label.AlignVCenter
797− text: model.label
798− color: model.clickable ? "white" /*theme.palette.normal.backgroundText*/ : theme.palette.normal.backgroundSecondaryText
799− //fontSize: model.clickable && index == 0 ? "medium" : "small" // FIXME too small
800− font.weight: index == 0 ? Font.Medium : Font.Light
801− }
802
789
803 onClicked: {
790 onClicked: {
804 if (!model.clickable) {
791 if (!model.clickable) {