!84 fixbug

Merge pull request !84 from 杨敏/openkylin/nile
2024-06-01 01:35:11 +00:00 · 2024-06-01 01:35:11 +00:00 · f96fe7cf23
parent 8c559251b5
commit f96fe7cf23
2 changed files with 101 additions and 0 deletions
--- a/debian/patches/0032-84-fixbug.patch
+++ b/debian/patches/0032-84-fixbug.patch
@ -0,0 +1,100 @@
+From: =?utf-8?b?5p2o5pWP?= <yangmin@kylinos.cn>
+Date: Sat, 1 Jun 2024 01:35:11 +0000
+Subject: =?utf-8?q?!84_fixbug_Merge_pull_request_!84_from_=E6=9D=A8?=
+ =?utf-8?q?=E6=95=8F/openkylin/nile?=
+
+---
+ src/widgets/fullbackgroundwidget.cpp | 14 +++++++-------
+ src/widgets/fullbackgroundwidget.h   |  2 +-
+ src/widgets/lockwidget.cpp           |  5 +++++
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/src/widgets/fullbackgroundwidget.cpp b/src/widgets/fullbackgroundwidget.cpp
+index 764179d..01d63d1 100644
+--- a/src/widgets/fullbackgroundwidget.cpp
+++ b/src/widgets/fullbackgroundwidget.cpp
+@@ -151,7 +151,7 @@ bool FullBackgroundWidget::eventFilter(QObject *obj, QEvent *event)
+     if (!QX11Info::isPlatformX11()) {
+         if (event->type() == QEvent::MouseButtonPress
+             || event->type() == QEvent::MouseMove /* || event->type() == 7*/) {
+-            if (screenStatus & SCREEN_SAVER && !isBlank) {
+            if (screenStatus & SCREEN_SAVER && !m_isBlank) {
+                 onClearScreensaver();
+             }
+         }
+@@ -273,7 +273,7 @@ void FullBackgroundWidget::onShowBlankScreensaver(int nDelay, bool isHasLock)
+     }
+ 
+     setCursor(Qt::BlankCursor);
+-    isBlank = true;
+    m_isBlank = true;
+ 
+     if (0 == nDelay) {
+         /*在进行压力测试时，可能会出现锁屏界面启动极慢，导致在睡眠之前调用了锁屏，但
+@@ -286,8 +286,8 @@ void FullBackgroundWidget::onShowBlankScreensaver(int nDelay, bool isHasLock)
+         }
+     } else {
+         QTimer::singleShot(nDelay, this, [=]() {
+-            if (isBlank) {
+-                isBlank = false;
+            if (m_isBlank) {
+                m_isBlank = false;
+                 onClearScreensaver();
+             }
+         });
+@@ -487,7 +487,7 @@ void FullBackgroundWidget::onPrepareForSleep(bool sleep)
+         // uninhibit();
+     } else {
+         if (screenStatus & SCREEN_SAVER) {
+-            isBlank = false;
+            m_isBlank = false;
+             onClearScreensaver();
+         } else {
+             repaint();
+@@ -780,7 +780,7 @@ void FullBackgroundWidget::onGlobalKeyRelease(const quint8 &key)
+ 
+ void FullBackgroundWidget::onGlobalButtonDrag(int xPos, int yPos)
+ {
+-    if (screenStatus & SCREEN_SAVER && !isBlank) {
+    if (screenStatus & SCREEN_SAVER && !m_isBlank) {
+         qDebug() << "clearclear";
+         onClearScreensaver();
+     }
+@@ -788,7 +788,7 @@ void FullBackgroundWidget::onGlobalButtonDrag(int xPos, int yPos)
+ 
+ void FullBackgroundWidget::onGlobalButtonPressed(int xPos, int yPos)
+ {
+-    if (screenStatus & SCREEN_SAVER && !isBlank) {
+    if (screenStatus & SCREEN_SAVER && !m_isBlank) {
+         onClearScreensaver();
+     }
+ }
+diff --git a/src/widgets/fullbackgroundwidget.h b/src/widgets/fullbackgroundwidget.h
+index c8127f8..fdc17f5 100644
+--- a/src/widgets/fullbackgroundwidget.h
+++ b/src/widgets/fullbackgroundwidget.h
+@@ -155,7 +155,7 @@ private:
+     float m_backgroundAlpha = 0.0;
+ 
+     ScreenStatus screenStatus = UNDEFINED;
+-    int isBlank;
+    bool m_isBlank = false;
+ 
+     QTimer *m_timerLock = nullptr;
+     int m_RREventBase;
+diff --git a/src/widgets/lockwidget.cpp b/src/widgets/lockwidget.cpp
+index b1eb10a..2734d08 100644
+--- a/src/widgets/lockwidget.cpp
+++ b/src/widgets/lockwidget.cpp
+@@ -725,6 +725,11 @@ void LockWidget::onUsersInfoChanged()
+     UserInfoPtr ptrUser = m_modelLockDialog->findUserByName(m_curUserInfo->name());
+     if (ptrUser) {
+         m_curUserInfo = ptrUser;
+        if (m_btnItemSession && m_curUserInfo->isLoggedIn()) {
+            buttonListWidget->setItemHidden(m_btnItemSession, true);
+        } else {
+            buttonListWidget->setItemHidden(m_btnItemSession, false);
+        }
+         if (authDialog) {
+             authDialog->onCurUserInfoChanged(m_curUserInfo);
+         }
--- a/debian/patches/series
+++ b/debian/patches/series
@ -29,3 +29,4 @@
 0029-81-format-codes.patch
 0030-82-fixbug.patch
 0031-83-fixbug.patch
+0032-84-fixbug.patch