1*4882a593SmuzhiyunFrom 5adf8cdfef83ddddead8029e311729b381c7fd33 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Mon, 4 Mar 2019 17:22:51 +0800 4*4882a593SmuzhiyunSubject: [PATCH 06/17] qwaylandwindow: Don't try to move fullscreen/maximized 5*4882a593Smuzhiyun window 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun src/client/qwaylandwindow.cpp | 6 +++++- 10*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 1 deletion(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp 13*4882a593Smuzhiyunindex 6cbd315..6ec9e99 100644 14*4882a593Smuzhiyun--- a/src/client/qwaylandwindow.cpp 15*4882a593Smuzhiyun+++ b/src/client/qwaylandwindow.cpp 16*4882a593Smuzhiyun@@ -351,7 +351,11 @@ void QWaylandWindow::setGeometry_helper(const QRect &rect) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun void QWaylandWindow::setGeometry(const QRect &rect) 19*4882a593Smuzhiyun { 20*4882a593Smuzhiyun- setGeometry_helper(rect); 21*4882a593Smuzhiyun+ if (window()->windowStates() == Qt::WindowFullScreen 22*4882a593Smuzhiyun+ || window()->windowStates() == Qt::WindowMaximized) 23*4882a593Smuzhiyun+ setGeometry_helper(QRect(QPoint(), rect.size())); 24*4882a593Smuzhiyun+ else 25*4882a593Smuzhiyun+ setGeometry_helper(rect); 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun if (window()->isVisible() && rect.isValid()) { 28*4882a593Smuzhiyun if (mWindowDecoration) 29*4882a593Smuzhiyun-- 30*4882a593Smuzhiyun2.20.1 31*4882a593Smuzhiyun 32