Merge pull request !27 from 杨敏/openkylin/nile
This commit is contained in:
杨敏 2024-11-15 08:55:56 +00:00 committed by Gitee
commit bf4cd34bc7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 28 additions and 19 deletions

9
debian/changelog vendored
View File

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

View File

@ -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());