Port to QWaylandWindow::setShellIntegration()
With QWaylandWindow::setShellIntegration(), it's possible to use xdg-shell and layer-shell protocols in the same process. It's important for plasmashell, where we want to use the layer shell protocol for special surfaces such as the desktop background, and the xdg shell protocol for dialogs. In order to make a QWindow use the layer shell protocol, you need to call LayerShellQt::Window::get() before the window is mapped.
This commit is contained in:
parent
07e63cab8c
commit
2985398375
10 changed files with 45 additions and 102 deletions
|
@ -14,7 +14,6 @@
|
|||
|
||||
#include <QMetaEnum>
|
||||
|
||||
#include <interfaces/shell.h>
|
||||
#include <interfaces/window.h>
|
||||
|
||||
using namespace LayerShellQt;
|
||||
|
@ -51,8 +50,6 @@ class BasicWindow : public QRasterWindow
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
Shell::useLayerShell();
|
||||
|
||||
QGuiApplication app(argc, argv);
|
||||
|
||||
const auto layerMetaEnum = QMetaEnum::fromType<Window::Layer>();
|
||||
|
@ -79,6 +76,8 @@ int main(int argc, char **argv)
|
|||
BasicWindow window;
|
||||
|
||||
LayerShellQt::Window *layerShell = LayerShellQt::Window::get(&window);
|
||||
layerShell->setLayer(Window::LayerBottom);
|
||||
|
||||
if (parser.isSet(marginsOption)) {
|
||||
int margins = parser.value(marginsOption).toInt();
|
||||
layerShell->setMargins({margins, margins, margins, margins});
|
||||
|
@ -102,6 +101,10 @@ int main(int argc, char **argv)
|
|||
|
||||
window.show();
|
||||
|
||||
BasicWindow window2;
|
||||
window2.resize(400, 400);
|
||||
window2.show();
|
||||
|
||||
// just so you don't block yourself out whilst testing
|
||||
QTimer::singleShot(5000, &app, &QGuiApplication::quit);
|
||||
return app.exec();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue