mirror/layer-shell-qt
1
0
Fork 0
mirror of https://invent.kde.org/plasma/layer-shell-qt.git synced 2025-05-25 17:40:21 -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.

(cherry picked from commit 3c85e2e889)
This commit is contained in:
Fabian Vogt 2023-02-21 16:03:51 +01:00
parent 7a862bdcd4
commit ddc4aead87
1 changed files with 8 additions and 2 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 <QPointer>
#include <optional>
using namespace LayerShellQt;
@ -26,7 +27,7 @@ public:
Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
Window::Layer layer = Window::LayerTop;
QMargins margins;
QPointer<QScreen> desiredOutput;
std::optional<QPointer<QScreen>> desiredOutput;
};
static QMap<QWindow *, Window *> s_map;
@ -103,7 +104,12 @@ Window::Layer Window::layer() const
QScreen *Window::desiredOutput() const
{
return d->desiredOutput;
// Don't use .value_or here to avoid a temporary QPointer
if (d->desiredOutput.has_value()) {
return d->desiredOutput.value();
}
return d->parentWindow->screen();
}
void Window::setDesiredOutput(QScreen *output)