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

SidebarAutoHide support floating gap contains mouse

Browse Source 
--floating gap window is now activated independently of
kwin edges supports and only when really needed.
SidebarAutoHide visibility mode has been adjusted in order
to work nicely with floating gap window helper
This commit is contained in:
Michail Vourlakos 2020-07-29 00:58:21 +03:00
parent 0d02a92733
commit 6cb97068c2
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/view/visibilitymanager.cpp
View File

@ -70,6 +70,7 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
connect(this, &VisibilityManager::enableKWinEdgesChanged, this, &VisibilityManager::updateKWinEdgesSupport);
connect(this, &VisibilityManager::modeChanged, this, &VisibilityManager::updateKWinEdgesSupport);
connect(this, &VisibilityManager::modeChanged, this, &VisibilityManager::updateFloatingGapWindow);
connect(this, &VisibilityManager::mustBeShown, this, [&]() {
if (m_latteView && !m_latteView->isVisible()) {
@ -79,8 +80,11 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
if (m_latteView) {
connect(m_latteView, &Latte::View::eventTriggered, this, &VisibilityManager::viewEventManager);
connect(m_latteView, &Latte::View::behaveAsPlasmaPanelChanged , this, &VisibilityManager::updateFloatingGapWindow);
connect(m_latteView, &Latte::View::behaveAsPlasmaPanelChanged , this, &VisibilityManager::updateKWinEdgesSupport);
connect(m_latteView, &Latte::View::byPassWMChanged, this, &VisibilityManager::updateFloatingGapWindow);
connect(m_latteView, &Latte::View::byPassWMChanged, this, &VisibilityManager::updateKWinEdgesSupport);
connect(m_latteView, &Latte::View::inEditModeChanged, this, &VisibilityManager::initViewFlags);
connect(m_latteView, &Latte::View::absoluteGeometryChanged, this, [&]() {
@ -332,28 +336,24 @@ void VisibilityManager::setMode(Latte::Types::Visibility mode)
break;
case Types::SidebarAutoHide:
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged, this, [&]() {
if(!m_latteView->inEditMode() && !isHidden()){
raiseView(m_containsMouse);
}
});
m_connections[base] = connect(this, &VisibilityManager::containsMouseChanged,
this, &VisibilityManager::updateHiddenState);
m_connections[base] = connect(m_latteView, &Latte::View::inEditModeChanged, this, [&]() {
m_connections[base+1] = connect(m_latteView, &Latte::View::inEditModeChanged, this, [&]() {
if (!m_latteView->inEditMode()) {
toggleHiddenState();
}
});
toggleHiddenState();
break;
default:
break;
}
m_latteView->containment()->config().writeEntry("visibility", static_cast<int>(m_mode));
updateKWinEdgesSupport();
emit modeChanged();
}
@ -763,6 +763,9 @@ void VisibilityManager::updateHiddenState()
dodgeAllWindows();
break;
case Types::SidebarAutoHide:
raiseView(m_latteView->inEditMode() || (m_containsMouse && !m_isHidden));
default:
break;
}
@ -994,7 +997,6 @@ void VisibilityManager::updateKWinEdgesSupport()
deleteEdgeGhostWindow();
deleteFloatingGapWindow();
}
} else if (m_mode == Types::WindowsCanCover) {
createEdgeGhostWindow();
} else {
@ -1003,6 +1005,23 @@ void VisibilityManager::updateKWinEdgesSupport()
}
}
void VisibilityManager::updateFloatingGapWindow()
{
if (m_latteView->isFloatingPanel() && !m_latteView->byPassWM()) {
if (m_mode == Types::AutoHide
|| m_mode == Types::DodgeActive
|| m_mode == Types::DodgeAllWindows
|| m_mode == Types::DodgeMaximized
|| m_mode == Types::SidebarAutoHide) {
createFloatingGapWindow();
} else {
deleteFloatingGapWindow();
}
} else {
deleteFloatingGapWindow();
}
}
void VisibilityManager::createEdgeGhostWindow()
{
if (!m_edgeGhostWindow) {

2
app/view/visibilitymanager.h
View File

@ -155,6 +155,8 @@ private slots:
void on_publishFrameExtents(); //! delayed
void publishFrameExtents(bool forceUpdate = false); //! direct
//! Floating Gap Helper window creation/removal
void updateFloatingGapWindow();
//! KWin Edges Support functions
void updateKWinEdgesSupport();