yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kcmdeco] Connect PreviewItem to factory's recreateDeco signal

Browse source
This commit is contained in:
Martin Gräßlin 2013-10-09 09:40:26 +02:00
parent 3ea18be574
commit f03104ac17
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kcmkwin/kwindecoration/preview.cpp
View file

@ -43,7 +43,7 @@ PreviewItem::PreviewItem(QQuickItem *parent)
{
setFlag(ItemHasContents, true);
setAcceptHoverEvents(true);
connect(this, &PreviewItem::libraryChanged, this, &PreviewItem::recreateDecorations);
connect(this, &PreviewItem::libraryChanged, this, &PreviewItem::loadDecorationPlugin);
}
PreviewItem::~PreviewItem()
@ -61,15 +61,24 @@ void PreviewItem::setLibraryName(const QString &library)
emit libraryChanged();
}
void PreviewItem::recreateDecorations()
void PreviewItem::loadDecorationPlugin()
{
const bool loaded = m_plugins->loadPlugin(m_libraryName);
if (!loaded) {
return;
}
m_plugins->destroyPreviousPlugin();
connect(m_plugins->factory(), &KDecorationFactory::recreateDecorations,
this, &PreviewItem::recreateDecorations, Qt::QueuedConnection);
recreateDecorations();
}
void PreviewItem::recreateDecorations()
{
delete m_activeDecoration;
delete m_inactiveDecoration;
m_activeEntered = nullptr;
m_inactiveEntered = nullptr;
m_activeDecoration = m_plugins->createDecoration(m_activeBridge.data());
m_inactiveDecoration = m_plugins->createDecoration(m_inactiveBridge.data());
@ -108,6 +117,7 @@ void PreviewItem::updatePreview()
render(&m_activeBuffer, m_activeDecoration);
render(&m_inactiveBuffer, m_inactiveDecoration);
update();
}
void PreviewItem::updateSize(const QSize &baseSize, KDecoration *decoration, QImage &buffer)

1
kcmkwin/kwindecoration/preview.h
View file

@ -54,6 +54,7 @@ protected:
virtual void hoverMoveEvent(QHoverEvent *event);
private Q_SLOTS:
void loadDecorationPlugin();
void recreateDecorations();
private: