on xenial help sign in
fixes for libertine scope
commita66224625c7cca400a2caf051397e5e7c7200707 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 6 Jun 2016, 17:47 (10 years ago) parent7fdbae9
1 file changed+6−5
qml/Dash/GenericScopeView.qml+6−5
qml/Dash/GenericScopeView.qml+6−5
@@ -342,8 +342,8 @@ FocusScope {
342342 }
343343 updateRanges();
344344 clickScopeSizingHacks();
345− if (scope && scope.id === "clickscope") {
346− if (categoryId === "predefined" || categoryId === "local") {
345+ if (scope && (scope.id === "clickscope" || scope.id === "libertine-scope.ubuntu_libertine-scope")) {
346+ if (scope.id === "libertine-scope.ubuntu_libertine-scope" || categoryId === "predefined" || categoryId === "local") {
347347 cardTool.artShapeSize = Qt.binding(function() { return Qt.size(units.gu(8), units.gu(7.5)) });
348348 cardTool.artShapeStyle = "icon";
349349 } else {
@@ -367,8 +367,9 @@ FocusScope {
367367 onPxpguChanged: clickScopeSizingHacks();
368368
369369 function clickScopeSizingHacks() {
370− if (scope && scope.id === "clickscope" &&
371− (categoryId === "predefined" || categoryId === "local")) {
370+ if (scope &&
371+ ((scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) ||
372+ scope.id === "libertine-scope.ubuntu_libertine-scope")) {
372373 // Yeah, hackish :/
373374 if (scopeView.width > units.gu(45)) {
374375 if (scopeView.width >= units.gu(70)) {
@@ -639,7 +640,7 @@ FocusScope {
639640 showBackButton: scopeView.hasBackAction
640641 searchEntryEnabled: true
641642 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
642− favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
643+ favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope" && scopeView.scope.id !== "libertine-scope.ubuntu_libertine-scope"
643644 favorite: scopeView.scope && scopeView.scope.favorite
644645 navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
645646 scopeStyle: scopeView.scopeStyle