git.iko.soy/unity8
on xenial help sign in
Renamed variable
b8c4039Andrea Cimitan
plugins/Dash/CardCreator.js+2−2
compare with xenial
unifiedsplit
@@ -73,7 +73,7 @@ var kArtShapeHolderCode = 'Item { \n\
73 Component.onCompleted: updateWidthHeightBindings(); \n\
73 Component.onCompleted: updateWidthHeightBindings(); \n\
74 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
74 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
75 visible: image.status == Image.Ready; \n\
75 visible: image.status == Image.Ready; \n\
76− borderSource: artShapeBorder
76+ borderSource: artShapeBorderSource
77 function updateWidthHeightBindings() { \n\
77 function updateWidthHeightBindings() { \n\
78 if (aspectSmallerThanImageAspect) { \n\
78 if (aspectSmallerThanImageAspect) { \n\
79 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
79 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
@@ -281,7 +281,7 @@ function cardString(template, components) {
281 property var template; \n\
281 property var template; \n\
282 property var components; \n\
282 property var components; \n\
283 property var cardData; \n\
283 property var cardData; \n\
284− property var artShapeBorder: "radius_idle.sci"; \n\
284+ property var artShapeBorderSource: "radius_idle.sci"; \n\
285 property real fontScale: 1.0; \n\
285 property real fontScale: 1.0; \n\
286 property int headerAlignment: Text.AlignLeft; \n\
286 property int headerAlignment: Text.AlignLeft; \n\
287 property int fixedHeaderHeight: -1; \n\
287 property int fixedHeaderHeight: -1; \n\
qml/Dash/CardCarousel.qml+1−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import "../Components"
19import "../Components"
20
20
21−
22DashRenderer {
21DashRenderer {
23 id: cardCarousel
22 id: cardCarousel
24
23
@@ -66,7 +65,7 @@ DashRenderer {
66 item.components = Qt.binding(function() { return cardTool.components; });
65 item.components = Qt.binding(function() { return cardTool.components; });
67 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
66 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
68 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
67 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
69− item.artShapeBorder = "none";
68+ item.artShapeBorderSource = "none";
70 }
69 }
71
70
72 BorderImage {
71 BorderImage {