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 Gitee
parent 220fee0c55 0720bb7a0f
commit 0b0e25f417
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 28 additions and 19 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 ukui-biometric-auth (4.20.0.0-ok1) huanghe; urgency=medium
* BUG号：无 * BUG号：无

38
polkit-agent/src/fullscreenbackground.cpp
View File

@ -338,27 +338,27 @@ void FullScreenBackground::moveToScreen(QScreen *screen)
void FullScreenBackground::moveToCursorScreen() void FullScreenBackground::moveToCursorScreen()
{ {
bool isFoundScreen = false; bool isFoundScreen = false;
if (m_isWayland) { // if (m_isWayland) {
QString strCurScreen = WindowManager::currentOutputName(); // QString strCurScreen = WindowManager::currentOutputName();
for (auto screen : QApplication::screens()) { // for (auto screen : QApplication::screens()) {
qDebug() << "Screen:" << screen->name() << "," << screen->geometry(); // qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
if (screen && screen->name() == strCurScreen) { // if (screen && screen->name() == strCurScreen) {
isFoundScreen = true; // isFoundScreen = true;
moveToScreen(screen); // moveToScreen(screen);
break; // break;
} // }
} // }
} else { // } else {
QPoint cursor = QCursor::pos(); QPoint cursor = QCursor::pos();
for (auto screen : QApplication::screens()) { for (auto screen : QApplication::screens()) {
qDebug() << "Screen:" << screen->name() << "," << screen->geometry(); qDebug() << "Screen:" << screen->name() << "," << screen->geometry();
if (screen && screen->geometry().contains(cursor)) { if (screen && screen->geometry().contains(cursor)) {
isFoundScreen = true; isFoundScreen = true;
moveToScreen(screen); moveToScreen(screen);
break; break;
}
} }
} }
// }
if (!isFoundScreen) { if (!isFoundScreen) {
if (QApplication::primaryScreen()) { if (QApplication::primaryScreen()) {
moveToScreen(QApplication::primaryScreen()); moveToScreen(QApplication::primaryScreen());