user Layouts::Manager for currentLayoutName

pull/12/head
Michail Vourlakos 5 years ago
parent 92c0a68a19
commit 4f92222863

@ -161,7 +161,7 @@ bool Layouts::selectedLayoutIsCurrentActive() const
Settings::Data::Layout selectedLayoutOriginal = selectedLayoutOriginalData(); Settings::Data::Layout selectedLayoutOriginal = selectedLayoutOriginalData();
selectedLayoutOriginal = selectedLayoutOriginal.isEmpty() ? selectedLayoutCurrent : selectedLayoutOriginal; selectedLayoutOriginal = selectedLayoutOriginal.isEmpty() ? selectedLayoutCurrent : selectedLayoutOriginal;
return (selectedLayoutCurrent.isActive && (selectedLayoutOriginal.name == m_corona->layoutsManager()->synchronizer()->currentLayoutName())); return (selectedLayoutCurrent.isActive && (selectedLayoutOriginal.name == m_corona->layoutsManager()->currentLayoutName()));
} }
const Data::Layout Layouts::selectedLayoutCurrentData() const const Data::Layout Layouts::selectedLayoutCurrentData() const

@ -836,7 +836,7 @@ void Layouts::updateActiveStates()
bool iActive{false}; bool iActive{false};
if (m_inMultipleMode && m_corona->layoutsManager()->synchronizer()->layout(m_layoutsTable[i].name) if (m_inMultipleMode && m_corona->layoutsManager()->synchronizer()->layout(m_layoutsTable[i].name)
|| (!m_inMultipleMode && o_layoutsTable[i].name == m_corona->layoutsManager()->synchronizer()->currentLayoutName())) { || (!m_inMultipleMode && o_layoutsTable[i].name == m_corona->layoutsManager()->currentLayoutName())) {
iActive = true; iActive = true;
} }

Loading…
Cancel
Save