kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-22 14:50:31 +03:00
Code Issues Projects Releases Wiki Activity

improve semantics for WM::setActiveEdge

Browse Source
This commit is contained in:
Michail Vourlakos 2020-01-03 13:32:08 +02:00
parent efbd2a8276
commit e0e6f5f6b3
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/view/visibilitymanager.cpp
View File

@ -475,7 +475,7 @@ void VisibilityManager::updateGhostWindowState()
if (inCurrentLayout) {
if (m_mode == Latte::Types::WindowsCanCover) {
m_wm->setEdgeStateFor(m_edgeGhostWindow, m_isBelowLayer && !m_containsMouse);
m_wm->setActiveEdge(m_edgeGhostWindow, m_isBelowLayer && !m_containsMouse);
} else {
bool viewIsFloatingAndMouseOnEdge =
m_latteView->behaveAsPlasmaPanel()
@ -483,10 +483,10 @@ void VisibilityManager::updateGhostWindowState()
&& m_latteView->screenEdgeMargin()>0
&& m_edgeGhostWindow->containsMouse();
m_wm->setEdgeStateFor(m_edgeGhostWindow, (m_isHidden && !m_containsMouse) || viewIsFloatingAndMouseOnEdge);
m_wm->setActiveEdge(m_edgeGhostWindow, (m_isHidden && !m_containsMouse) || viewIsFloatingAndMouseOnEdge);
}
} else {
m_wm->setEdgeStateFor(m_edgeGhostWindow, false);
m_wm->setActiveEdge(m_edgeGhostWindow, false);
}
}
}
@ -809,9 +809,9 @@ void VisibilityManager::createEdgeGhostWindow()
if (m_edgeGhostWindow) {
if (inCurrentLayout) {
m_wm->setEdgeStateFor(m_edgeGhostWindow, m_isHidden);
m_wm->setActiveEdge(m_edgeGhostWindow, m_isHidden);
} else {
m_wm->setEdgeStateFor(m_edgeGhostWindow, false);
m_wm->setActiveEdge(m_edgeGhostWindow, false);
}
}
});

2
app/wm/abstractwindowinterface.h
View File

@ -95,7 +95,7 @@ public:
virtual void skipTaskBar(const QDialog &dialog) const = 0;
virtual void slideWindow(QWindow &view, Slide location) const = 0;
virtual void enableBlurBehind(QWindow &view) const = 0;
virtual void setEdgeStateFor(QWindow *view, bool active) const = 0;
virtual void setActiveEdge(QWindow *view, bool active) const = 0;
virtual void requestActivate(WindowId wid) const = 0;
virtual void requestClose(WindowId wid) const = 0;

2
app/wm/waylandinterface.cpp
View File

@ -430,7 +430,7 @@ void WaylandInterface::enableBlurBehind(QWindow &view) const
KWindowEffects::enableBlurBehind(view.winId());
}
void WaylandInterface::setEdgeStateFor(QWindow *view, bool active) const
void WaylandInterface::setActiveEdge(QWindow *view, bool active) const
{
ViewPart::ScreenEdgeGhostWindow *window = qobject_cast<ViewPart::ScreenEdgeGhostWindow *>(view);

2
app/wm/waylandinterface.h
View File

@ -91,7 +91,7 @@ public:
WindowId winIdFor(QString appId, QRect geometry) const override;
AppData appDataFor(WindowId wid) const override;
void setEdgeStateFor(QWindow *view, bool active) const override;
void setActiveEdge(QWindow *view, bool active) const override;
void switchToNextVirtualDesktop() const override;
void switchToPreviousVirtualDesktop() const override;

2
app/wm/xwindowinterface.cpp
View File

@ -273,7 +273,7 @@ void XWindowInterface::enableBlurBehind(QWindow &view) const
KWindowEffects::enableBlurBehind(view.winId());
}
void XWindowInterface::setEdgeStateFor(QWindow *view, bool active) const
void XWindowInterface::setActiveEdge(QWindow *view, bool active) const
{
ViewPart::ScreenEdgeGhostWindow *window = qobject_cast<ViewPart::ScreenEdgeGhostWindow *>(view);

2
app/wm/xwindowinterface.h
View File

@ -75,7 +75,7 @@ public:
WindowId winIdFor(QString appId, QRect geometry) const override;
AppData appDataFor(WindowId wid) const override;
void setEdgeStateFor(QWindow *view, bool active) const override;
void setActiveEdge(QWindow *view, bool active) const override;
void switchToNextVirtualDesktop() const override;
void switchToPreviousVirtualDesktop() const override;