diff --git a/app/view/visibilitymanager.cpp b/app/view/visibilitymanager.cpp index 5428212b6..4c1634d6e 100644 --- a/app/view/visibilitymanager.cpp +++ b/app/view/visibilitymanager.cpp @@ -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); } } }); diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h index e690915df..2aacefcaa 100644 --- a/app/wm/abstractwindowinterface.h +++ b/app/wm/abstractwindowinterface.h @@ -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; diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp index 35598a2f8..33cdac5b3 100644 --- a/app/wm/waylandinterface.cpp +++ b/app/wm/waylandinterface.cpp @@ -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(view); diff --git a/app/wm/waylandinterface.h b/app/wm/waylandinterface.h index 146c9cb2a..1e0ac0a9a 100644 --- a/app/wm/waylandinterface.h +++ b/app/wm/waylandinterface.h @@ -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; diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index b82dacc78..2fe44ea24 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -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(view); diff --git a/app/wm/xwindowinterface.h b/app/wm/xwindowinterface.h index 4771dbfec..7f34a2b63 100644 --- a/app/wm/xwindowinterface.h +++ b/app/wm/xwindowinterface.h @@ -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;