c7f09fc · unity8 · git.iko.soy

git.iko.soy/unity8

todo--

commitc7f09fc72341a2c92f510565a5866a5a57181e35 authorAlbert Astals <albert.astals@canonical.com> dateFri 11 Jul 2014, 16:23 (12 years ago) parent6e226a7

2 files changed+5−4

compare with xenial

unifiedsplit

qml/Dash/ScopesOverview.qml+1 qml/Dash/ScopesOverviewFavourites.qml+4−4

qml/Dash/ScopesOverview.qml+1

@@ -206,6 +206,7 @@ Item {

206206 if (index == 0) {

207207 item.scopeWidth = root.width;

208208 item.scopeHeight = root.height;

209+ item.appliedScale = Qt.binding(function() { return loader.scale })

209210 } else if (index == 1) {

210211 item.extraHeight = bottomBar.height;

211212 }

qml/Dash/ScopesOverviewFavourites.qml+4−4

@@ -25,12 +25,12 @@ ListView {

2525 property var cardTool: null

2626 property real scopeHeight: 0

2727 property real scopeWidth: 0

28+ property real appliedScale: 1

2829

2930 orientation: ListView.Horizontal

30− // TODO root.parent.scale

3131 // TODO current item

3232

33− spacing: units.gu(2) / root.parent.scale

33+ spacing: units.gu(2) / appliedScale

3434

3535 delegate: Loader {

3636 id: loader

@@ -38,8 +38,8 @@ ListView {

3838

3939 sourceComponent: cardTool.cardComponent

4040 onLoaded: {

41− item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight / root.parent.scale; });

42− item.fontScale = Qt.binding(function() { return 1 / root.parent.scale; });

41+ item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight / appliedScale; });

42+ item.fontScale = Qt.binding(function() { return 1 / appliedScale; });

4343 item.height = Qt.binding(function() { return root.scopeHeight; });

4444 item.width = Qt.binding(function() { return root.scopeWidth; });

4545 item.cardData = Qt.binding(function() { return model; });