kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +03:00
Code Issues Projects Releases Wiki Activity

unload Central(active)layouts to become Shared

Browse Source
This commit is contained in:
Michail Vourlakos 2019-05-07 20:54:51 +03:00
parent c37f605257
commit 0c4bbd9529
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/layoutmanager.cpp
View File

@ -126,45 +126,9 @@ void LayoutManager::unload()
//! Unload all CentralLayouts
while (!m_centralLayouts.isEmpty()) {
CentralLayout *layout = m_centralLayouts.at(0);
m_centralLayouts.removeFirst();
if (m_multipleModeInitialized) {
layout->syncToLayoutFile(true);
}
layout->unloadContainments();
layout->unloadLatteViews();
if (m_multipleModeInitialized) {
clearUnloadedContainmentsFromLinkedFile(layout->unloadedContainmentsIds(), true);
}
delete layout;
unloadCentralLayout(layout);
}
//! Unload all SharedLayouts
//! DEPRECATED as now SharedLayouts are unloading themselves when
//! they have no central layouts assigned to them
/*while (!m_sharedLayouts.isEmpty()) {
SharedLayout *layout = m_sharedLayouts.at(0);
m_sharedLayouts.removeFirst();
unloadSharedLayout(layout);
if (multipleMode) {
layout->syncToLayoutFile(true);
}
layout->unloadContainments();
layout->unloadLatteViews();
if (multipleMode) {
clearUnloadedContainmentsFromLinkedFile(layout->unloadedContainmentsIds(), true);
}
delete layout;
}*/
m_multipleModeInitialized = false;
//! Remove no-needed temp files
@ -181,6 +145,28 @@ void LayoutManager::unload()
file2.remove();
}
void LayoutManager::unloadCentralLayout(CentralLayout *layout)
{
int pos = m_centralLayouts.indexOf(layout);
if (pos>=0) {
CentralLayout *central = m_centralLayouts.takeAt(0);
if (m_multipleModeInitialized) {
central->syncToLayoutFile(true);
}
central->unloadContainments();
central->unloadLatteViews();
if (m_multipleModeInitialized) {
clearUnloadedContainmentsFromLinkedFile(central->unloadedContainmentsIds(), true);
}
delete central;
}
}
void LayoutManager::unloadSharedLayout(SharedLayout *layout)
{
if (m_sharedLayouts.contains(layout)) {

2
app/layoutmanager.h
View File

@ -79,6 +79,8 @@ public:
void load();
void loadLayoutOnStartup(QString layoutName);
void unload();
void unloadCentralLayout(CentralLayout *layout);
void hideAllViews();
void pauseLayout(QString layoutName);
void syncLatteViewsToScreens();

8
app/settings/settingsdialog.cpp
View File

@ -1679,6 +1679,14 @@ void SettingsDialog::updateActiveShares()
QHash<CentralLayout *, SharedLayout *> unassign;
//! CENTRAL (active) layouts that will become SHARED must be unloaded first
for (QHash<const QString, QStringList>::iterator i=currentSharesMap.begin(); i!=currentSharesMap.end(); ++i) {
CentralLayout *central = m_corona->layoutManager()->centralLayout(nameForId(i.key()));
if (central) {
m_corona->layoutManager()->unloadCentralLayout(central);
}
}
//! CENTRAL (active) layouts that update their (active) SHARED layouts
//! AND load SHARED layouts that are NOT ACTIVE
for (QHash<const QString, QStringList>::iterator i=currentSharesMap.begin(); i!=currentSharesMap.end(); ++i) {