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

periodically checking containmouse after slidein

Browse Source
This commit is contained in:
Michail Vourlakos 2020-01-19 20:50:39 +02:00
parent 4d3d6b244d
commit 35ce0496ec
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/view/screenedgeghostwindow.cpp
View File

@ -197,7 +197,10 @@ void ScreenEdgeGhostWindow::updateGeometry()
QRect newGeometry;
if (KWindowSystem::compositingActive()) {
if (m_latteView->screenEdgeMargin()>0 && m_latteView->behaveAsPlasmaPanel()) {
//real floating
m_thickness = m_latteView->screenEdgeMargin();
} else if (KWindowSystem::compositingActive()) {
m_thickness = 6;
} else {
m_thickness = 2;

25
app/view/visibilitymanager.cpp
View File

@ -71,6 +71,12 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
connect(this, &VisibilityManager::enableKWinEdgesChanged, this, &VisibilityManager::updateKWinEdgesSupport);
connect(this, &VisibilityManager::modeChanged, this, &VisibilityManager::updateKWinEdgesSupport);
connect(this, &VisibilityManager::mustBeHide, this, [&]() {
if (supportsKWinEdges() && m_latteView->screenEdgeMargin()>0 && m_latteView->behaveAsPlasmaPanel()) {
m_edgeGhostWindow->showWithMask();
}
});
if (m_latteView) {
connect(m_latteView, &Latte::View::eventTriggered, this, &VisibilityManager::viewEventManager);
connect(m_latteView, &Latte::View::byPassWMChanged, this, &VisibilityManager::updateKWinEdgesSupport);
@ -491,7 +497,7 @@ void VisibilityManager::updateGhostWindowState()
&& m_latteView->screenEdgeMargin()>0
&& (m_edgeGhostWindow->containsMouse() || m_containsMouse);*/
bool activated = (m_isHidden && !m_containsMouse); /*|| viewIsFloatingAndContainsMouse;*/
bool activated = (m_isHidden && !m_containsMouse && !m_edgeGhostWindow->containsMouse());
m_wm->setActiveEdge(m_edgeGhostWindow, activated);
}
@ -797,10 +803,21 @@ void VisibilityManager::createEdgeGhostWindow()
connect(m_edgeGhostWindow, &ScreenEdgeGhostWindow::containsMouseChanged, this, [ = ](bool contains) {
if (contains) {
raiseView(true);
if (!m_isHidden) {
//! immediate call
m_edgeGhostWindow->hideWithMask();
emit mustBeShown();
} else {
raiseView(true);
}
} else {
m_timerShow.stop();
updateGhostWindowState();
if (!m_isHidden) {
//! immediate call
updateHiddenState();
} else {
m_timerShow.stop();
updateGhostWindowState();
}
}
});