mirror/layer-shell-qt
1
0
Fork 0
mirror of https://invent.kde.org/plasma/layer-shell-qt.git synced 2025-06-04 01:28:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the QScreen of the QWindow as default output

Browse Source 
If the Window::setDesiredOutput API was not called for the QWindow, use
QWindow::screen(). This allows assigning QWindows to specific screens using
the plain Qt API.

Passing nullptr to Window::setDesiredOutput explicitly results in nil as
desired output for the layer, which lets the compositor select a screen.
This commit is contained in:
Fabian Vogt 2023-02-21 16:03:51 +01:00
parent b9f8f6447d
commit 9e5c32e1ab
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/window.cpp
View File

@ -8,6 +8,7 @@
#include <layershellqt_logging.h> #include <layershellqt_logging.h>
#include <QPointer> #include <QPointer>
#include <optional>
using namespace LayerShellQt; using namespace LayerShellQt;
@ -26,7 +27,7 @@ public:
Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive; Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
Window::Layer layer = Window::LayerTop; Window::Layer layer = Window::LayerTop;
QMargins margins; QMargins margins;
QPointer<QScreen> desiredOutput; std::optional<QPointer<QScreen>> desiredOutput;
}; };
static QMap<QWindow *, Window *> s_map; static QMap<QWindow *, Window *> s_map;
@ -103,7 +104,7 @@ Window::Layer Window::layer() const
QScreen *Window::desiredOutput() const QScreen *Window::desiredOutput() const
{ {
return d->desiredOutput; return d->desiredOutput.value_or(nullptr);
} }
void Window::setDesiredOutput(QScreen *output) void Window::setDesiredOutput(QScreen *output)
@ -111,6 +112,11 @@ void Window::setDesiredOutput(QScreen *output)
d->desiredOutput = output; d->desiredOutput = output;
} }
bool Window::desiredOutputSet() const
{
return d->desiredOutput.has_value();
}
Window::Window(QWindow *window) Window::Window(QWindow *window)
: QObject(window) : QObject(window)
, d(new WindowPrivate(window)) , d(new WindowPrivate(window))

1
src/interfaces/window.h
View File

@ -76,6 +76,7 @@ public:
*/ */
void setDesiredOutput(QScreen *output); void setDesiredOutput(QScreen *output);
QScreen *desiredOutput() const; QScreen *desiredOutput() const;
bool desiredOutputSet() const;
/** /**
* Sets a string based identifier for this window. * Sets a string based identifier for this window.

2
src/qwaylandlayersurface.cpp
View File

@ -24,7 +24,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandC
Q_ASSERT(interface); Q_ASSERT(interface);
wl_output *output = nullptr; wl_output *output = nullptr;
QScreen *screen = interface->desiredOutput(); QScreen *screen = interface->desiredOutputSet() ? interface->desiredOutput() : window->window()->screen();
if (screen) { if (screen) {
auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(screen->handle()); auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(screen->handle());
// Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created // Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created