fix #75, improve loadLayout on startup

--loadLayout is called only once and when
the activities service is in ready state
v0.6
Michail Vourlakos 8 years ago
parent 5eb53a2cbc
commit 43434926c1

@ -57,6 +57,11 @@ DockCorona::DockCorona(QObject *parent)
setKPackage(package);
qmlRegisterTypes();
connect(this, &Corona::containmentAdded, this, &DockCorona::addDock);
if (m_activityConsumer && (m_activityConsumer->serviceStatus() == KActivities::Consumer::Running)) {
load();
}
connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &DockCorona::load);
}
@ -80,7 +85,10 @@ DockCorona::~DockCorona()
void DockCorona::load()
{
loadLayout();
if (m_activityConsumer && (m_activityConsumer->serviceStatus() == KActivities::Consumer::Running) && m_activitiesStarting) {
m_activitiesStarting = false;
loadLayout();
}
}
void DockCorona::cleanConfig()

@ -78,6 +78,8 @@ private:
void qmlRegisterTypes() const;
int primaryScreenId() const;
bool m_activitiesStarting{true};
QHash<const Plasma::Containment *, DockView *> m_dockViews;
QHash<const Plasma::Containment *, DockView *> m_waitingDockViews;

Loading…
Cancel
Save