git.iko.soy/unity8
on xenial help sign in
Fixes per review.
9966be2Rodney Dawes
qml/Dash/CardTool.qml+2−3
compare with xenial
unifiedsplit
@@ -77,9 +77,8 @@ Item {
77 return layout;
77 return layout;
78 }
78 }
79
79
80− readonly property bool isAppLikeScope: scopeId === "clickscope" || scopeId === "libertine-scope.ubuntu_libertine-scope"
80+ readonly property bool isAppLikeScope: scopeId === "libertine-scope.ubuntu_libertine-scope"
81− readonly property bool isAppLikeScopeAppCategory: ((scopeId === "clickscope" && (categoryId === "predefined" || categoryId === "local"))
82− || (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint"))
81+ readonly property bool isAppLikeScopeAppCategory: (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint")
83
82
84 readonly property string artShapeStyle: {
83 readonly property string artShapeStyle: {
85 if (isAppLikeScope) {
84 if (isAppLikeScope) {
qml/Dash/GenericScopeView.qml+1−1
@@ -582,7 +582,7 @@ FocusScope {
582 showSignatureLine: !showBackButton
582 showSignatureLine: !showBackButton
583 searchEntryEnabled: true
583 searchEntryEnabled: true
584 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
584 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
585− favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
585+ favoriteEnabled: scopeView.scope
586 favorite: scopeView.scope && scopeView.scope.favorite
586 favorite: scopeView.scope && scopeView.scope.favorite
587 navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
587 navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
588 scopeStyle: scopeView.scopeStyle
588 scopeStyle: scopeView.scopeStyle
qml/Dash/ScopesListCategory.qml+1−1
@@ -89,7 +89,7 @@ Item {
89 icon: model.art || model.mascot || ""
89 icon: model.art || model.mascot || ""
90 text: model.title || ""
90 text: model.title || ""
91 subtext: model.subtitle || ""
91 subtext: model.subtitle || ""
92− showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
92+ showStar: root.isFavoritesFeed || root.isAlsoInstalled
93 isFavorite: root.isFavoritesFeed
93 isFavorite: root.isFavoritesFeed
94
94
95 hideChildren: dragItem.loaderToShrink == loader
95 hideChildren: dragItem.loaderToShrink == loader