kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-08 01:18:21 +03:00
Code Issues Projects Releases Wiki Activity

update struts properly for TopLayouts

Browse Source
This commit is contained in:
Michail Vourlakos 2019-04-07 20:15:58 +03:00
parent caedf9842e
commit 385b0e0b20
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/layout/genericlayout.cpp
View File

@ -133,6 +133,11 @@ void GenericLayout::setBlockAutomaticLatteViewCreation(bool block)
m_blockAutomaticLatteViewCreation = block; m_blockAutomaticLatteViewCreation = block;
} }
bool GenericLayout::isCurrent() const
{
return name() == m_corona->layoutManager()->currentLayoutName();
}
int GenericLayout::viewsCount(int screen) const int GenericLayout::viewsCount(int screen) const
{ {
if (!m_corona) { if (!m_corona) {

1
app/layout/genericlayout.h
View File

@ -71,6 +71,7 @@ public:
void importToCorona(); void importToCorona();
bool initToCorona(Latte::Corona *corona); bool initToCorona(Latte::Corona *corona);
virtual bool isCurrent() const;
bool isWritable() const; bool isWritable() const;
bool layoutIsBroken() const; bool layoutIsBroken() const;

11
app/layout/toplayout.cpp
View File

@ -36,6 +36,17 @@ TopLayout::~TopLayout()
{ {
} }
bool TopLayout::isCurrent() const
{
for (const auto &layout : m_activeLayouts) {
if (layout->isCurrent()) {
return true;
}
}
return false;
}
const QStringList TopLayout::appliedActivities() const QStringList TopLayout::appliedActivities()
{ {
if (!m_corona) { if (!m_corona) {

3
app/layout/toplayout.h
View File

@ -48,6 +48,9 @@ public:
const QStringList appliedActivities(); const QStringList appliedActivities();
//! OVERRIDE GeneralLayout implementations
bool isCurrent() const override;
public slots: public slots:
void addActiveLayout(ActiveLayout *layout); void addActiveLayout(ActiveLayout *layout);
void removeActiveLayout(ActiveLayout *layout); void removeActiveLayout(ActiveLayout *layout);

2
app/view/visibilitymanager.cpp
View File

@ -244,7 +244,7 @@ void VisibilityManager::updateStrutsBasedOnLayoutsAndActivities()
{ {
bool multipleLayoutsAndCurrent = (m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts bool multipleLayoutsAndCurrent = (m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts
&& m_latteView->managedLayout() && !m_latteView->positioner()->inLocationChangeAnimation() && m_latteView->managedLayout() && !m_latteView->positioner()->inLocationChangeAnimation()
&& m_latteView->managedLayout()->name() == m_corona->layoutManager()->currentLayoutName()); && m_latteView->managedLayout()->isCurrent());
if (m_corona->layoutManager()->memoryUsage() == Types::SingleLayout || multipleLayoutsAndCurrent) { if (m_corona->layoutManager()->memoryUsage() == Types::SingleLayout || multipleLayoutsAndCurrent) {
wm->setViewStruts(*m_latteView, m_viewGeometry, m_latteView->location()); wm->setViewStruts(*m_latteView, m_viewGeometry, m_latteView->location());