git.iko.soy/unity8
on xenial help sign in
Dinamically reload card size for click scope
48fb276Andrea Cimitan
qml/Dash/GenericScopeView.qml+17−9
compare with xenial
unifiedsplit
@@ -360,17 +360,9 @@ FocusScope {
360 baseItem.expand(shouldExpand, false /*animate*/);
360 baseItem.expand(shouldExpand, false /*animate*/);
361 }
361 }
362 updateRanges();
362 updateRanges();
363+ clickScopeSizingHacks();
363 if (scope && scope.id === "clickscope") {
364 if (scope && scope.id === "clickscope") {
364 if (categoryId === "predefined" || categoryId === "local") {
365 if (categoryId === "predefined" || categoryId === "local") {
365− // Yeah, hackish :/
366− if (scopeView.width > units.gu(45)) {
367− if (scopeView.width >= units.gu(70)) {
368− cardTool.cardWidth = units.gu(9);
369− } else {
370− cardTool.cardWidth = units.gu(10);
371− }
372− }
373− cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
374 item.artShapeStyle = "icon";
366 item.artShapeStyle = "icon";
375 } else {
367 } else {
376 // Should be ubuntu store icon
368 // Should be ubuntu store icon
@@ -387,6 +379,21 @@ FocusScope {
387 }
379 }
388 }
380 }
389
381
382+ function clickScopeSizingHacks() {
383+ if (scope && scope.id === "clickscope" &&
384+ (categoryId === "predefined" || categoryId === "local")) {
385+ // Yeah, hackish :/
386+ if (scopeView.width > units.gu(45)) {
387+ if (scopeView.width >= units.gu(70)) {
388+ cardTool.cardWidth = units.gu(9);
389+ } else {
390+ cardTool.cardWidth = units.gu(10);
391+ }
392+ }
393+ cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
394+ }
395+ }
396+
390 Connections {
397 Connections {
391 target: rendererLoader.item
398 target: rendererLoader.item
392 onClicked: { // (int index, var result, var item, var itemModel)
399 onClicked: { // (int index, var result, var item, var itemModel)
@@ -416,6 +423,7 @@ FocusScope {
416 target: scopeView
423 target: scopeView
417 onIsCurrentChanged: rendererLoader.updateRanges();
424 onIsCurrentChanged: rendererLoader.updateRanges();
418 onVisibleToParentChanged: rendererLoader.updateRanges();
425 onVisibleToParentChanged: rendererLoader.updateRanges();
426+ onWidthChanged: rendererLoader.clickScopeSizingHacks();
419 }
427 }
420 Connections {
428 Connections {
421 target: holdingList
429 target: holdingList