Paste P437

Masterwork From Distant Lands
ActivePublic

Authored by davidedmundson on Jul 17 2019, 9:54 AM.
diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
index c49686a4d..f2bfb89d5 100644
--- a/src/plasmaquick/appletquickitem.cpp
+++ b/src/plasmaquick/appletquickitem.cpp
@@ -51,6 +51,7 @@ AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickIte
: q(item),
switchWidth(-1),
switchHeight(-1),
+ initComplete(false),
applet(a),
expanded(false),
activationTogglesExpanded(false)
@@ -342,6 +343,10 @@ void AppletQuickItemPrivate::preloadForExpansion()
void AppletQuickItemPrivate::compactRepresentationCheck()
{
+ if (!initComplete) {
+ return;
+ }
+
if (!qmlObject->rootObject()) {
return;
}
@@ -669,6 +674,7 @@ void AppletQuickItem::init()
d->compactRepresentationExpander->loadUrl(compactExpanderUrl);
}
+ d->initComplete = true;
d->compactRepresentationCheck();
qmlObject()->engine()->rootContext()->setBaseUrl(qmlObject()->source());
qmlObject()->engine()->setContextForObject(this, qmlObject()->engine()->rootContext());
diff --git a/src/plasmaquick/private/appletquickitem_p.h b/src/plasmaquick/private/appletquickitem_p.h
index b2f302629..f9c1f2108 100644
--- a/src/plasmaquick/private/appletquickitem_p.h
+++ b/src/plasmaquick/private/appletquickitem_p.h
@@ -132,6 +132,7 @@ public:
bool expanded : 1;
bool activationTogglesExpanded : 1;
+ bool initComplete: 1;
static QHash<QObject *, AppletQuickItem *> s_rootObjects;
};
davidedmundson edited the content of this paste. (Show Details)Jul 17 2019, 9:54 AM
davidedmundson changed the title of this paste from untitled to Masterwork From Distant Lands.