Make checkForOverlayWindow X11Compositor only
Summary: Overlay windows is an X11 thing. Test Plan: Compiles. Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D23608
This commit is contained in:
parent
5cb1a71889
commit
76e57ab5d0
3 changed files with 10 additions and 17 deletions
|
@ -867,13 +867,6 @@ void WaylandCompositor::start()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WaylandCompositor::checkForOverlayWindow(WId w) const
|
|
||||||
{
|
|
||||||
Q_UNUSED(w)
|
|
||||||
// There is no overlay window in Wayland/XWayland.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int WaylandCompositor::refreshRate() const
|
int WaylandCompositor::refreshRate() const
|
||||||
{
|
{
|
||||||
// TODO: This makes no sense on Wayland. First step would be to atleast
|
// TODO: This makes no sense on Wayland. First step would be to atleast
|
||||||
|
|
13
composite.h
13
composite.h
|
@ -99,11 +99,6 @@ public:
|
||||||
return m_scene;
|
return m_scene;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks whether @p w is the Scene's overlay window.
|
|
||||||
*/
|
|
||||||
virtual bool checkForOverlayWindow(WId w) const = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Static check to test whether the Compositor is available and active.
|
* @brief Static check to test whether the Compositor is available and active.
|
||||||
*
|
*
|
||||||
|
@ -191,8 +186,6 @@ public:
|
||||||
|
|
||||||
void toggleCompositing() override;
|
void toggleCompositing() override;
|
||||||
|
|
||||||
bool checkForOverlayWindow(WId w) const override;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void start() override;
|
void start() override;
|
||||||
|
|
||||||
|
@ -252,7 +245,11 @@ public:
|
||||||
|
|
||||||
void configChanged() override;
|
void configChanged() override;
|
||||||
|
|
||||||
bool checkForOverlayWindow(WId w) const override;
|
/**
|
||||||
|
* Checks whether @p w is the Scene's overlay window.
|
||||||
|
*/
|
||||||
|
bool checkForOverlayWindow(WId w) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns Whether the Scene's Overlay X Window is visible.
|
* @returns Whether the Scene's Overlay X Window is visible.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -610,8 +610,11 @@ Client* Workspace::createClient(xcb_window_t w, bool is_mapped)
|
||||||
|
|
||||||
Unmanaged* Workspace::createUnmanaged(xcb_window_t w)
|
Unmanaged* Workspace::createUnmanaged(xcb_window_t w)
|
||||||
{
|
{
|
||||||
if (m_compositor && m_compositor->checkForOverlayWindow(w))
|
if (X11Compositor *compositor = X11Compositor::self()) {
|
||||||
return NULL;
|
if (compositor->checkForOverlayWindow(w)) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
Unmanaged* c = new Unmanaged();
|
Unmanaged* c = new Unmanaged();
|
||||||
if (!c->track(w)) {
|
if (!c->track(w)) {
|
||||||
Unmanaged::deleteUnmanaged(c);
|
Unmanaged::deleteUnmanaged(c);
|
||||||
|
|
Loading…
Reference in a new issue