diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-08-24 08:31:57 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-08-29 06:34:54 +0000 |
| commit | 9875a14daaec12ca65d3cb4a2aaf2c4582e6191d (patch) | |
| tree | a290a31c19972a486a66494a78d8109b06e02764 | |
| parent | aa341afd9b428f5ad2d0bc1c16d9cda64a4b04fb (diff) | |
Compositor: emit outputAdded if setDefaultOutput adds an output
[ChangeLog][Compositor] Fixed a bug where outputAdded was not emitted
if a new output was added through QWaylandCompositor::setDefaultOutput.
Change-Id: I875badd340d6241fda7a5fce9b3bba8ca8b2f560
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index f08470b78..c6c7c316a 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -748,9 +748,11 @@ void QWaylandCompositor::setDefaultOutput(QWaylandOutput *output) Q_D(QWaylandCompositor); if (d->outputs.size() && d->outputs.first() == output) return; - d->outputs.removeOne(output); + bool alreadyAdded = d->outputs.removeOne(output); d->outputs.prepend(output); - defaultOutputChanged(); + emit defaultOutputChanged(); + if (!alreadyAdded) + emit outputAdded(output); } /*! |