40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From b6d85c2a75f5618e87267f5b5c361455be257a17 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Inho Lee <inho.lee@qt.io>
|
||
|
|
Date: Mon, 1 Nov 2021 14:23:58 +0100
|
||
|
|
Subject: [PATCH 46/52] Do not create decorations when the shellSurface is not
|
||
|
|
ready
|
||
|
|
|
||
|
|
A cases reported that client windows try to make decorations
|
||
|
|
when their shell surfaces are null.
|
||
|
|
Since the surfaces' requests for decorations should be applied,
|
||
|
|
those case will be failed to create decorations.
|
||
|
|
|
||
|
|
This patch was modified by Paul Tvete's advice.
|
||
|
|
(paul.tvete@qt.io)
|
||
|
|
|
||
|
|
Pick-to: 6.2 5.15
|
||
|
|
Task-number: QTBUG-97608
|
||
|
|
Change-Id: I2563dbd73b730f81cc411857af07da99ceb2d063
|
||
|
|
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
||
|
|
(cherry picked from commit 246f0c0bc01dd059bf8165e81f7b49efa36e4d95)
|
||
|
|
---
|
||
|
|
src/client/qwaylandwindow.cpp | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
|
||
|
|
index ac01dc05..acfe390e 100644
|
||
|
|
--- a/src/client/qwaylandwindow.cpp
|
||
|
|
+++ b/src/client/qwaylandwindow.cpp
|
||
|
|
@@ -813,7 +813,7 @@ bool QWaylandWindow::createDecoration()
|
||
|
|
decoration = false;
|
||
|
|
if (mSubSurfaceWindow)
|
||
|
|
decoration = false;
|
||
|
|
- if (mShellSurface && !mShellSurface->wantsDecorations())
|
||
|
|
+ if (!mShellSurface || !mShellSurface->wantsDecorations())
|
||
|
|
decoration = false;
|
||
|
|
|
||
|
|
bool hadDecoration = mWindowDecoration;
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|