git.iko.soy/unity8
on xenial help sign in
fix the launcher theming
210a749Michael Zanetti
qml/Launcher/LauncherPanel.qml+34−30
compare with xenial
unifiedsplit
@@ -767,38 +767,42 @@ Rectangle {
767 quickList.state = "open";
767 quickList.state = "open";
768 }
768 }
769
769
770− Column {
770+ StyledItem {
771− id: quickListColumn
772 width: parent.width
771 width: parent.width
772+ height: quickListColumn.height
773+
774+ theme: ThemeSettings {
775+ name: "Ubuntu.Components.Themes.Ambiance"
776+ }
777+
778+ Column {
779+ id: quickListColumn
780+ width: parent.width
773− height: childrenRect.height
781+ height: childrenRect.height
774−
782+
775− Repeater {
783+ Repeater {
776− id: popoverRepeater
784+ id: popoverRepeater
777− model: quickList.model
785+ model: quickList.model
778−
786+
779− ListItems.Standard {
787+ ListItems.Standard {
780− objectName: "quickListEntry" + index
788+ objectName: "quickListEntry" + index
781− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
789+ text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
782− highlightWhenPressed: model.clickable
790+ highlightWhenPressed: model.clickable
783− selected: index === quickList.selectedIndex
791+ selected: index === quickList.selectedIndex
784−
792+
785− // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
786− // ListItems don't know that they are sitting in a themed Popover where the color
787− // needs to be inverted.
788− __foregroundColor: "black"
789−
790− onClicked: {
793+ onClicked: {
791− if (!model.clickable) {
794+ if (!model.clickable) {
792− return;
795+ return;
796+ }
797+ Haptics.play();
798+ quickList.state = "";
799+ // Unsetting model to prevent showing changing entries during fading out
800+ // that may happen because of triggering an action.
801+ LauncherModel.quickListActionInvoked(quickList.appId, index);
802+ quickList.focus = false;
803+ root.kbdNavigationCancelled();
804+ quickList.model = undefined;
793 }
805 }
794− Haptics.play();
795− quickList.state = "";
796− // Unsetting model to prevent showing changing entries during fading out
797− // that may happen because of triggering an action.
798− LauncherModel.quickListActionInvoked(quickList.appId, index);
799− quickList.focus = false;
800− root.kbdNavigationCancelled();
801− quickList.model = undefined;
802 }
806 }
803 }
807 }
804 }
808 }