git.iko.soy/unity8
on xenial help sign in
Introduce the card creator cache
ff90c01Albert Astals
qml/Dash/CardCreator.js+2−2
compare with xenial
unifiedsplit
@@ -19,7 +19,7 @@
19
19
20.pragma library
20.pragma library
21
21
22−function createCardComponent(parent, template, components, asynchronous) {
22+function createCardComponent(parent, template, components) {
23 var imports = 'import QtQuick 2.2; \
23 var imports = 'import QtQuick 2.2; \
24 import Ubuntu.Components 0.1; \
24 import Ubuntu.Components 0.1; \
25 import Ubuntu.Thumbnailer 0.1;';
25 import Ubuntu.Thumbnailer 0.1;';
@@ -34,7 +34,7 @@ function createCardComponent(parent, template, components, asynchronous) {
34 property int headerAlignment: Text.AlignLeft; \
34 property int headerAlignment: Text.AlignLeft; \
35 property size fixedArtShapeSize: Qt.size(-1, -1); \
35 property size fixedArtShapeSize: Qt.size(-1, -1); \
36 readonly property string title: cardData && cardData["title"] || ""; \
36 readonly property string title: cardData && cardData["title"] || ""; \
37− property bool asynchronous: ' + asynchronous + '; \
37+ property bool asynchronous: true; \
38 property bool showHeader: true; \
38 property bool showHeader: true; \
39 implicitWidth: childrenRect.width; ';
39 implicitWidth: childrenRect.width; ';
40
40
qml/Dash/CardCreatorCache.qmlnew file+24
@@ -0,0 +1,24 @@
1+pragma Singleton
2+import QtQuick 2.2
3+import "CardCreator.js" as CardCreator
4+
5+QtObject {
6+ id: root
7+
8+ property var cache: new Object();
9+
10+ function getCardComponent(template, components) {
11+ if (template === undefined || components === undefined)
12+ return undefined;
13+
14+ var tString = JSON.stringify(template);
15+ var cString = JSON.stringify(components);
16+ var allString = tString + cString;
17+ var component = cache[allString];
18+ if (component === undefined) {
19+ component = CardCreator.createCardComponent(root, template, components);
20+ cache[allString] = component;
21+ }
22+ return component;
23+ }
24+}
qml/Dash/CardTool.qml+2−32
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import "CardCreator.js" as CardCreator
18+import Unity.Dash 1.0
19
19
20/*!
20/*!
21 \brief Tool for introspecting Card properties.
21 \brief Tool for introspecting Card properties.
@@ -66,37 +66,7 @@ Item {
66 return layout;
66 return layout;
67 }
67 }
68
68
69− property var cardComponent: undefined
69+ property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components);
70−
71− onTemplateChanged: {
72−// console.log("onTemplateChanged", cardTool, JSON.stringify(template));
73− updateCardComponent();
74− }
75− onComponentsChanged: {
76−// console.log("onComponentsChanged", cardTool, JSON.stringify(components));
77− updateCardComponent();
78− }
79−
80− // For some reason we get spurious template and components changed signals, since we
81− // do not want to call createCardComponent without need we cache the stringified vars
82− // and do a second changed check
83− property string templateString: ""
84− property string componentsString: ""
85−
86− function updateCardComponent()
87− {
88− if (cardTool.template === undefined || cardTool.components === undefined)
89− return;
90−
91− var tString = JSON.stringify(template);
92− var cString = JSON.stringify(components);
93− if (tString != templateString || cString != componentsString) {
94− templateString = tString;
95− componentsString = cString;
96− console.log("CardTool CALLING createCardComponent", cardLoader, tString, cString);
97− cardComponent = CardCreator.createCardComponent(cardLoader, cardTool.template, cardTool.components, true /* async */);
98− }
99− }
100
70
101 // FIXME: Saviq
71 // FIXME: Saviq
102 // Only way for the card below to actually be laid out completely.
72 // Only way for the card below to actually be laid out completely.
src/main.cpp+3
@@ -22,6 +22,7 @@
22#include <QtGui/QGuiApplication>
22#include <QtGui/QGuiApplication>
23#include <QtQml/QQmlEngine>
23#include <QtQml/QQmlEngine>
24#include <QtQml/QQmlContext>
24#include <QtQml/QQmlContext>
25+#include <QtQml/qqml.h>
25#include <qpa/qplatformnativeinterface.h>
26#include <qpa/qplatformnativeinterface.h>
26#include <QLibrary>
27#include <QLibrary>
27#include <QDebug>
28#include <QDebug>
@@ -106,6 +107,8 @@ int startShell(int argc, const char** argv, void* server)
106 application->installNativeEventFilter(mouseTouchAdaptor);
107 application->installNativeEventFilter(mouseTouchAdaptor);
107 }
108 }
108
109
110+ qmlRegisterSingletonType(QUrl("file://" + qmlDirectory() + "Dash/CardCreatorCache.qml"), "Unity.Dash", 1, 0, "CardCreatorCache");
111+
109 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
112 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
110 /* Shell is declared as a system session so that it always receives all
113 /* Shell is declared as a system session so that it always receives all
111 input events.
114 input events.