bfc9db6 · unity8 · git.iko.soy

git.iko.soy/unity8

Fixes for the phone

Make sure we bind instead of assign since some sizes get updated later on Force the art shape size since to be what we want

commitbfc9db6f80ebb8074636e794c79d2241f4c68652 authorAlbert Astals <albert.astals@canonical.com> dateTue 22 Jul 2014, 15:05 (12 years ago) parent1f39c02

2 files changed+5−4

compare with xenial

unifiedsplit

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

qml/Dash/ScopesOverview.qml+4−4

@@ -276,10 +276,10 @@ Item {

276276 item.model = Qt.binding(function() { return results })

277277 item.cardTool = cardTool;

278278 if (index == 0) {

279− item.scopeWidth = root.width;

280− item.scopeHeight = root.height;

281− item.appliedScale = Qt.binding(function() { return loader.scale })

282− item.currentIndex = Qt.binding(function() { return root.currentIndex })

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

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

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

282+ item.currentIndex = Qt.binding(function() { return root.currentIndex });

283283 } else if (index == 1) {

284284 item.extraHeight = bottomBar.height;

285285 }

qml/Dash/ScopesOverviewFavorites.qml+1

@@ -53,6 +53,7 @@ Flickable {

5353

5454 sourceComponent: cardTool.cardComponent

5555 onLoaded: {

56+ item.fixedArtShapeSize = Qt.binding(function() { return Qt.size(root.scopeWidth, root.scopeHeight); });

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

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

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