1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-09 00:58:15 +03:00

contextmenu:hide inactive layouts at MultipleMode

This commit is contained in:
Michail Vourlakos 2021-02-28 13:47:45 +02:00
parent be2ec0a7af
commit b1de2a3905
2 changed files with 11 additions and 16 deletions

View File

@ -1156,7 +1156,7 @@ QStringList Corona::contextMenuData()
for(const auto &layoutName : m_layoutsManager->synchronizer()->menuLayouts()) {
if (m_layoutsManager->synchronizer()->centralLayout(layoutName)) {
data << QString("1," + layoutName);
} else {
} else if (m_layoutsManager->memoryUsage() == Latte::MemoryUsage::SingleLayout) {
data << QString("0," + layoutName);
}
}

View File

@ -197,13 +197,6 @@ QList<QAction *> Menu::contextualActions()
m_data = replyData.value();
}
if (m_data.size() > LAYOUTSPOS + 1) {
m_layoutsAction->setEnabled(true);
m_layoutsAction->setVisible(true);
} else {
m_layoutsAction->setVisible(false);
}
ViewType viewType{DockView};
if (m_data.size() >= LAYOUTSPOS + 1) {
@ -267,18 +260,20 @@ void Menu::populateLayouts()
QString layout = m_data[i].right(m_data[i].length() - 2);
QString currentText = (memoryUsage == MultipleLayouts && currentNames.contains(layout)) ?
(" " + i18nc("current layout", "(Current)")) : "";
QString layoutName = layout + currentText;
// QString currentText = (memoryUsage == MultipleLayouts && currentNames.contains(layout)) ?
// (" " + i18nc("current layout", "(Current)")) : "";
QString layoutName = layout;// + currentText;
QAction *layoutAction = m_switchLayoutsMenu->addAction(layoutName);
layoutAction->setCheckable(true);
if (memoryUsage == LayoutsMemoryUsage::SingleLayout) {
layoutAction->setCheckable(true);
if (isActive) {
layoutAction->setChecked(true);
} else {
layoutAction->setChecked(false);
if (isActive) {
layoutAction->setChecked(true);
} else {
layoutAction->setChecked(false);
}
}
layoutAction->setData(layout);