git.iko.soy/unity8
on xenial help sign in
Update cardCreator cache con artShapeStyle changes
commit35985672b5b6c22766ffa66da23b2cee306a57cb authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 2 Jun 2016, 14:44 (10 years ago) parent7fdbae9
2 files changed+3−3
compare with xenial
unifiedsplit
plugins/Dash/CardCreatorCache.qml+1−1 qml/Dash/CardTool.qml+2−2
plugins/Dash/CardCreatorCache.qml+1−1
@@ -29,7 +29,7 @@ QtObject {
2929
3030 var tString = JSON.stringify(template);
3131 var cString = JSON.stringify(components);
32− var allString = tString + cString + isCardTool;
32+ var allString = tString + cString + artShapeStyle + isCardTool;
3333 var component = cache[allString];
3434 if (component === undefined) {
3535 component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);
qml/Dash/CardTool.qml+2−2
@@ -70,7 +70,7 @@ Item {
7070 // Not readonly because gets overwritten from GenericScopeView in some cases
7171 property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "inset"
7272
73− property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, artShapeStyle);
73+ property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, cardTool.artShapeStyle);
7474
7575 // FIXME: Saviq
7676 // Only way for the card below to actually be laid out completely.
@@ -212,7 +212,7 @@ Item {
212212 "attributes": attributesModel.model,
213213 "socialActions": socialActionsModel.model
214214 }
215− sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, artShapeStyle);
215+ sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, cardTool.artShapeStyle);
216216 onLoaded: {
217217 item.objectName = "cardToolCard";
218218 item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });