github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix ident in visibilitymanager

Browse Source 
--AlwaysVisible signals to update struts
are always enabled independent of Single/Multiple
mode but for Single mode they are just ignored
pull/5/head
Michail Vourlakos 6 years ago
parent 1a054ac176
commit a472ef34f3
1 changed files with 83 additions and 80 deletions
Show Stats Download Patch File Download Diff File

163
app/view/visibilitymanager.cpp
Unescape Escape View File

@ -162,67 +162,70 @@ void VisibilityManager::setMode(Latte::Types::Visibility mode)
} }
switch (m_mode) { switch (m_mode) {
case Types::AlwaysVisible: { case Types::AlwaysVisible: {
if (m_latteView->containment() && m_latteView->screen()) { if (m_latteView->containment() && m_latteView->screen()) {
updateStrutsBasedOnLayoutsAndActivities();
}
m_connections[base] = connect(m_corona->activitiesConsumer(), &KActivities::Consumer::currentActivityChanged, this, [&]() {
if (m_corona && m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts) {
updateStrutsBasedOnLayoutsAndActivities(); updateStrutsBasedOnLayoutsAndActivities();
} }
});
m_connections[base+1] = connect(m_latteView, &Latte::View::activitiesChanged, this, [&]() {
if (m_corona && m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts) { if (m_corona && m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts) {
m_connections[base] = connect(m_corona->activitiesConsumer(), &KActivities::Consumer::currentActivityChanged, this, [&]() { updateStrutsBasedOnLayoutsAndActivities();
updateStrutsBasedOnLayoutsAndActivities();
});
m_connections[base+1] = connect(m_latteView, &Latte::View::activitiesChanged, this, [&]() {
updateStrutsBasedOnLayoutsAndActivities();
});
} }
});
raiseView(true); raiseView(true);
}
break; break;
}
case Types::AutoHide: { case Types::AutoHide: {
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged, this, [&]() { m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged, this, [&]() {
raiseView(m_containsMouse);
});
raiseView(m_containsMouse); raiseView(m_containsMouse);
} });
raiseView(m_containsMouse);
break; break;
}
case Types::DodgeActive: { case Types::DodgeActive: {
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged
, this, &VisibilityManager::dodgeActive); , this, &VisibilityManager::dodgeActive);
m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::activeWindowTouchingChanged m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::activeWindowTouchingChanged
, this, &VisibilityManager::dodgeActive); , this, &VisibilityManager::dodgeActive);
dodgeActive(); dodgeActive();
}
break; break;
}
case Types::DodgeMaximized: { case Types::DodgeMaximized: {
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged
, this, &VisibilityManager::dodgeMaximized); , this, &VisibilityManager::dodgeMaximized);
m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::activeWindowMaximizedChanged m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::activeWindowMaximizedChanged
, this, &VisibilityManager::dodgeActive); , this, &VisibilityManager::dodgeActive);
dodgeMaximized(); dodgeMaximized();
}
break; break;
}
case Types::DodgeAllWindows: { case Types::DodgeAllWindows: {
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged
, this, &VisibilityManager::dodgeAllWindows); , this, &VisibilityManager::dodgeAllWindows);
m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::existsWindowTouchingChanged m_connections[base+1] = connect(m_latteView->windowsTracker(), &WindowsTracker::existsWindowTouchingChanged
, this, &VisibilityManager::dodgeAllWindows); , this, &VisibilityManager::dodgeAllWindows);
}
break; break;
}
case Types::WindowsGoBelow: case Types::WindowsGoBelow:
break; break;
default: default:
break; break;
} }
@ -429,24 +432,24 @@ void VisibilityManager::updateHiddenState()
return; return;
switch (m_mode) { switch (m_mode) {
case Types::AutoHide: case Types::AutoHide:
raiseView(m_containsMouse); raiseView(m_containsMouse);
break; break;
case Types::DodgeActive: case Types::DodgeActive:
dodgeActive(); dodgeActive();
break; break;
case Types::DodgeMaximized: case Types::DodgeMaximized:
dodgeMaximized(); dodgeMaximized();
break; break;
case Types::DodgeAllWindows: case Types::DodgeAllWindows:
dodgeAllWindows(); dodgeAllWindows();
break; break;
default: default:
break; break;
} }
} }
@ -551,7 +554,7 @@ void VisibilityManager::restoreConfig()
setMode(fMode); setMode(fMode);
}); });
connect(m_latteView->containment(), &Plasma::Containment::userConfiguringChanged connect(m_latteView->containment(), &Plasma::Containment::userConfiguringChanged
, this, [&](bool configuring) { , this, [&](bool configuring) {
if (configuring && m_timerStartUp.isActive()) if (configuring && m_timerStartUp.isActive())
m_timerStartUp.start(100); m_timerStartUp.start(100);
}); });
@ -560,7 +563,7 @@ void VisibilityManager::restoreConfig()
} }
connect(m_latteView->containment(), &Plasma::Containment::userConfiguringChanged connect(m_latteView->containment(), &Plasma::Containment::userConfiguringChanged
, this, [&](bool configuring) { , this, [&](bool configuring) {
if (!configuring) { if (!configuring) {
saveConfig(); saveConfig();
} }
@ -589,34 +592,34 @@ void VisibilityManager::setContainsMouse(bool contains)
void VisibilityManager::viewEventManager(QEvent *ev) void VisibilityManager::viewEventManager(QEvent *ev)
{ {
switch (ev->type()) { switch (ev->type()) {
case QEvent::Enter: case QEvent::Enter:
setContainsMouse(true); setContainsMouse(true);
break; break;
case QEvent::Leave: case QEvent::Leave:
setContainsMouse(false); setContainsMouse(false);
break; break;
case QEvent::DragEnter: case QEvent::DragEnter:
m_dragEnter = true; m_dragEnter = true;
if (m_isHidden) if (m_isHidden)
emit mustBeShown(); emit mustBeShown();
break; break;
case QEvent::DragLeave: case QEvent::DragLeave:
case QEvent::Drop: case QEvent::Drop:
m_dragEnter = false; m_dragEnter = false;
updateHiddenState(); updateHiddenState();
break; break;
case QEvent::Show: case QEvent::Show:
m_wm->setViewExtraFlags(*m_latteView); m_wm->setViewExtraFlags(*m_latteView);
break; break;
default: default:
break; break;
} }
} }
@ -642,9 +645,9 @@ void VisibilityManager::setEnableKWinEdges(bool enable)
void VisibilityManager::updateKWinEdgesSupport() void VisibilityManager::updateKWinEdgesSupport()
{ {
if (m_mode == Types::AutoHide if (m_mode == Types::AutoHide
|| m_mode == Types::DodgeActive || m_mode == Types::DodgeActive
|| m_mode == Types::DodgeAllWindows || m_mode == Types::DodgeAllWindows
|| m_mode == Types::DodgeMaximized) { || m_mode == Types::DodgeMaximized) {
if (m_enableKWinEdgesFromUser) { if (m_enableKWinEdgesFromUser) {
createEdgeGhostWindow(); createEdgeGhostWindow();
} else if (!m_enableKWinEdgesFromUser) { } else if (!m_enableKWinEdgesFromUser) {
@ -673,7 +676,7 @@ void VisibilityManager::createEdgeGhostWindow()
}); });
m_connectionsKWinEdges[0] = connect(m_wm, &WindowSystem::currentActivityChanged, m_connectionsKWinEdges[0] = connect(m_wm, &WindowSystem::currentActivityChanged,
this, [&]() { this, [&]() {
bool inCurrentLayout = (m_corona->layoutManager()->memoryUsage() == Types::SingleLayout || bool inCurrentLayout = (m_corona->layoutManager()->memoryUsage() == Types::SingleLayout ||
(m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts (m_corona->layoutManager()->memoryUsage() == Types::MultipleLayouts
&& m_latteView->managedLayout() && !m_latteView->positioner()->inLocationChangeAnimation() && m_latteView->managedLayout() && !m_latteView->positioner()->inLocationChangeAnimation()

Write Preview
Loading…
Cancel
Save