git.iko.soy/unity8
on xenial help sign in
Renamed variable
commitb8c40392c0318fc7510f96ef6c58f9bda310d6ce authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 12 May 2014, 17:55 (12 years ago) parentda005e1
2 files changed+3−4
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+2−2 qml/Dash/CardCarousel.qml+1−2
plugins/Dash/CardCreator.js+2−2
@@ -73,7 +73,7 @@ var kArtShapeHolderCode = 'Item { \n\
7373 Component.onCompleted: updateWidthHeightBindings(); \n\
7474 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
7575 visible: image.status == Image.Ready; \n\
76− borderSource: artShapeBorder
76+ borderSource: artShapeBorderSource
7777 function updateWidthHeightBindings() { \n\
7878 if (aspectSmallerThanImageAspect) { \n\
7979 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
@@ -281,7 +281,7 @@ function cardString(template, components) {
281281 property var template; \n\
282282 property var components; \n\
283283 property var cardData; \n\
284− property var artShapeBorder: "radius_idle.sci"; \n\
284+ property var artShapeBorderSource: "radius_idle.sci"; \n\
285285 property real fontScale: 1.0; \n\
286286 property int headerAlignment: Text.AlignLeft; \n\
287287 property int fixedHeaderHeight: -1; \n\
qml/Dash/CardCarousel.qml+1−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import "../Components"
2020
21−
2221DashRenderer {
2322 id: cardCarousel
2423
@@ -66,7 +65,7 @@ DashRenderer {
6665 item.components = Qt.binding(function() { return cardTool.components; });
6766 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
6867 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
69− item.artShapeBorder = "none";
68+ item.artShapeBorderSource = "none";
7069 }
7170
7271 BorderImage {