!87 fixbug

Merge pull request !87 from 杨敏/openkylin/nile

debian/patches/0035-87-fixbug.patch

@@ -0,0 +1,41 @@
+From: =?utf-8?b?5p2o5pWP?= <yangmin@kylinos.cn>
+Date: Wed, 5 Jun 2024 08:23:06 +0000
+Subject: =?utf-8?q?!87_fixbug_Merge_pull_request_!87_from_=E6=9D=A8?=
+ =?utf-8?q?=E6=95=8F/openkylin/nile?=
+
+---
+ src/widgets/fullbackgroundwidget.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/widgets/fullbackgroundwidget.cpp b/src/widgets/fullbackgroundwidget.cpp
+index 7cfee1e..c71510e 100644
+--- a/src/widgets/fullbackgroundwidget.cpp
++++ b/src/widgets/fullbackgroundwidget.cpp
+@@ -133,9 +133,6 @@ void FullBackgroundWidget::initUI()
+     }
+ 
+     setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+-    QTimer::singleShot(100, this, [=]() {
+-        WindowManager::setWindowLayer(this->windowHandle(), WindowLayer::ScreenLock);
+-    });
+ 
+     // 登录模式下监听屏幕插拔
+     if (isGreeterMode()) {
+@@ -170,6 +167,9 @@ bool FullBackgroundWidget::eventFilter(QObject *obj, QEvent *event)
+         }
+         QTimer::singleShot(500, this, SLOT(setLockState()));
+         // QTimer::singleShot(200,this,SLOT(killWindow()));
++    } else if (event->type() == QEvent::Show || event->type() == QEvent::UpdateRequest) {
++        WindowManager::setWindowLayer(this->windowHandle(), WindowLayer::ScreenLock);
++        //qDebug()<<"Set window layer ScreenLock";
+     }
+     return QWidget::eventFilter(obj, event);
+ }
+@@ -637,7 +637,6 @@ void FullBackgroundWidget::showEvent(QShowEvent *event)
+     if (QX11Info::isPlatformX11())
+         tryGrabKeyboard();
+     QTimer::singleShot(100, this, [=]() {
+-        WindowManager::setWindowLayer(this->windowHandle(), WindowLayer::ScreenLock);
+         m_lockWidget->updateFont();
+         m_lockWidget->updateFontSize();
+     });

debian/patches/series

@@ -32,3 +32,4 @@
 0032-84-fixbug.patch
 0033-85-fixbug.patch
 0034-86.patch
+0035-87-fixbug.patch