openkylin
/
ukui-biometric-auth
mirror of https://gitee.com/openkylin/ukui-biometric-auth.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!28 fixbug 

Merge pull request !28 from 杨敏/openkylin/huanghe
This commit is contained in:
杨敏 2024-11-15 09:05:39 +00:00 committed by openkylin-cibot
parent 737afcb182
commit 133fd11fab
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
ukui-biometric-auth (4.20.0.0-ok1.2) huanghe; urgency=medium
* BUG号：#IB4M9L 修改密码等需要授权认证的操作直接失败，无法打开提权窗口
* 需求号：无
* 其他改动说明：无
* 其他改动影响域：无
-- Yang Min <yangmin@kylinos.cn> Fri, 15 Nov 2024 17:01:40 +0800
ukui-biometric-auth (4.20.0.0-ok1) huanghe; urgency=medium
* BUG号：无

60
debian/patches/0002-28-fixbug.patch vendored Normal file
View File

@ -0,0 +1,60 @@
From: =?utf-8?b?5p2o5pWP?= <yangmin@kylinos.cn>
Date: Fri, 15 Nov 2024 09:05:39 +0000
Subject: =?utf-8?q?!28_fixbug_Merge_pull_request_!28_from_=E6=9D=A8?=
=?utf-8?q?=E6=95=8F/openkylin/huanghe?=
---
polkit-agent/src/fullscreenbackground.cpp | 38 +++++++++++++++----------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/polkit-agent/src/fullscreenbackground.cpp b/polkit-agent/src/fullscreenbackground.cpp
index 9bbaa3d..40bb5b8 100644
--- a/polkit-agent/src/fullscreenbackground.cpp
+++ b/polkit-agent/src/fullscreenbackground.cpp
@@ -338,27 +338,27 @@ void FullScreenBackground::moveToScreen(QScreen *screen)
void FullScreenBackground::moveToCursorScreen()
{
bool isFoundScreen = false;
- if (m_isWayland) {
- QString strCurScreen = WindowManager::currentOutputName();
- for (auto screen : QApplication::screens()) {
- qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
- if (screen && screen->name() == strCurScreen) {
- isFoundScreen = true;
- moveToScreen(screen);
- break;
- }
- }
- } else {
- QPoint cursor = QCursor::pos();
- for (auto screen : QApplication::screens()) {
- qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
- if (screen && screen->geometry().contains(cursor)) {
- isFoundScreen = true;
- moveToScreen(screen);
- break;
- }
+ // if (m_isWayland) {
+ // QString strCurScreen = WindowManager::currentOutputName();
+ // for (auto screen : QApplication::screens()) {
+ // qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
+ // if (screen && screen->name() == strCurScreen) {
+ // isFoundScreen = true;
+ // moveToScreen(screen);
+ // break;
+ // }
+ // }
+ // } else {
+ QPoint cursor = QCursor::pos();
+ for (auto screen : QApplication::screens()) {
+ qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
+ if (screen && screen->geometry().contains(cursor)) {
+ isFoundScreen = true;
+ moveToScreen(screen);
+ break;
}
}
+ // }
if (!isFoundScreen) {
if (QApplication::primaryScreen()) {
moveToScreen(QApplication::primaryScreen());

1
debian/patches/series vendored
View File

@ -1 +1,2 @@
0001-update-changelog.patch
0002-28-fixbug.patch