← Back to branch summary

~nick-dedekind/unity8/side-stage-redesign-tutorial

« back to all changes in this revision

Viewing changes to qml/Dash/GenericScopeView.qml

  • Committer: Nick Dedekind
  • Date: 2015-12-14 18:06:18 UTC
  • mfrom: (1998.1.101 unity8)
  • Revision ID: nick.dedekind@canonical.com-20151214180618-men18zbauv1r153m
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Dash/GenericScopeView.qml
360
360
                        baseItem.expand(shouldExpand, false /*animate*/);
361
361
                    }
362
362
                    updateRanges();
363
 
                    if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
364
 
                        // Yeah, hackish :/
365
 
                        if (scopeView.width > units.gu(45)) {
366
 
                            if (scopeView.width >= units.gu(70)) {
367
 
                                cardTool.cardWidth = units.gu(9);
368
 
                            } else {
369
 
                                cardTool.cardWidth = units.gu(10);
 
363
                    if (scope && scope.id === "clickscope") {
 
364
                        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
                                }
370
372
                            }
 
373
                            cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
 
374
                            item.artShapeStyle = "icon";
 
375
                        } else {
 
376
                            // Should be ubuntu store icon
 
377
                            item.artShapeStyle = "flat";
 
378
                            item.backgroundShapeStyle = "shadow";
371
379
                        }
372
 
                        cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
373
 
                        item.artShapeStyle = "icon";
374
380
                    }
375
381
                    item.cardTool = cardTool;
376
382
                }