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

!97 fixbug 

Merge pull request !97 from 杨敏/openkylin/nile
This commit is contained in:
刘远鹏 2024-08-02 09:00:21 +00:00 committed by openkylin-cibot
parent 49b69e0e7f
commit 5fcbd2c5b8
3 changed files with 88 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-screensaver (4.10.0.0-ok29~0802) nile; urgency=medium
* BUG号：#IAF8BR 显示器息屏后，自动断开重连会导致电脑自动解锁登录
* 需求号：无
* 其他改动说明：无
* 其他改动影响域：无
-- Yang Min <yangmin@kylinos.cn> Fri, 02 Aug 2024 16:54:49 +0800
ukui-screensaver (4.10.0.0-ok28~0729) nile; urgency=medium
* BUG号：#I6YG2Q【会话管理器】无法使用键盘进行操作

78
debian/patches/0053-97-fixbug.patch vendored Normal file
View File

@ -0,0 +1,78 @@
From: =?utf-8?b?5YiY6L+c6bmP?=
<11195448+liuyuanpeng176@user.noreply.gitee.com>
Date: Fri, 2 Aug 2024 09:00:21 +0000
Subject: =?utf-8?q?!97_fixbug_Merge_pull_request_!97_from_=E6=9D=A8?=
=?utf-8?q?=E6=95=8F/openkylin/nile?=
---
src/widgets/powerlistwidget.cpp | 43 +++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/widgets/powerlistwidget.cpp b/src/widgets/powerlistwidget.cpp
index e76da23..1e84db7 100644
--- a/src/widgets/powerlistwidget.cpp
+++ b/src/widgets/powerlistwidget.cpp
@@ -190,8 +190,10 @@ void PowerListWidget::onListItemClicked(QListWidgetItem *item)
if (shutdownLockcheck.count() > 0) {
Q_EMIT showInhibitWarning(shutdownLockcheck, powerBtnList[i].m_inhibitType, false);
break;
- } else if(m_powerType == SAVER && m_modelLockDialog->getLoggedInUsersCount() >= 1 && powerBtnList[i].setFuncName != "Logout") {
- Q_EMIT sureShutDown(powerBtnList[i].m_inhibitType, false);
+ } else if (
+ m_powerType == SAVER && m_modelLockDialog->getLoggedInUsersCount() >= 1
+ && powerBtnList[i].setFuncName != "Logout") {
+ Q_EMIT sureShutDown(powerBtnList[i].m_inhibitType, false);
break;
} else if (m_modelLockDialog->getLoggedInUsersCount() > 1 && powerBtnList[i].setFuncName != "Logout") {
Q_EMIT mulUsersLogined(powerBtnList[i].m_inhibitType, false);
@@ -220,6 +222,9 @@ void PowerListWidget::onListItemClicked(QListWidgetItem *item)
void PowerListWidget::updateWidgetSize()
{
QScreen *screen = QApplication::primaryScreen();
+ if (!screen) {
+ return;
+ }
QRect rect = screen->geometry();
if (BTN_ITEM_SIZE_WIDTH * m_powerBtnNum < rect.width()) {
if (BTN_ITEM_SIZE_HEIGHT < this->maxHeight()) {
@@ -232,21 +237,25 @@ void PowerListWidget::updateWidgetSize()
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
}
} else { //宽度超过屏幕宽度，需要换行显示，取item宽度的倍数设为总宽度，防止显示不居中
- int pHeight = BTN_ITEM_SIZE_HEIGHT * (BTN_ITEM_SIZE_WIDTH * m_powerBtnNum / rect.width() + 1);
- if (pHeight < this->maxHeight()) {
- setFixedSize(QSize(
- rect.width() / BTN_ITEM_SIZE_WIDTH * (BTN_ITEM_SIZE_WIDTH + 3),
- BTN_ITEM_SIZE_HEIGHT * (BTN_ITEM_SIZE_WIDTH * m_powerBtnNum / rect.width() + 1)));
- m_scrollIsShow = false;
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- } else if ((rect.width() / BTN_ITEM_SIZE_WIDTH * BTN_ITEM_SIZE_WIDTH + 10) > rect.width()) { //需要显示滚动条
- setFixedSize(QSize((rect.width() / BTN_ITEM_SIZE_WIDTH - 1) * BTN_ITEM_SIZE_WIDTH + 10, this->maxHeight()));
- m_scrollIsShow = true;
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
- } else {
- setFixedSize(QSize(rect.width() / BTN_ITEM_SIZE_WIDTH * BTN_ITEM_SIZE_WIDTH + 10, this->maxHeight()));
- m_scrollIsShow = true;
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ if (rect.width() > 0) {
+ int pHeight = BTN_ITEM_SIZE_HEIGHT * (BTN_ITEM_SIZE_WIDTH * m_powerBtnNum / rect.width() + 1);
+ if (pHeight < this->maxHeight()) {
+ setFixedSize(QSize(
+ rect.width() / BTN_ITEM_SIZE_WIDTH * (BTN_ITEM_SIZE_WIDTH + 3),
+ BTN_ITEM_SIZE_HEIGHT * (BTN_ITEM_SIZE_WIDTH * m_powerBtnNum / rect.width() + 1)));
+ m_scrollIsShow = false;
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ } else if (
+ (rect.width() / BTN_ITEM_SIZE_WIDTH * BTN_ITEM_SIZE_WIDTH + 10) > rect.width()) { //需要显示滚动条
+ setFixedSize(
+ QSize((rect.width() / BTN_ITEM_SIZE_WIDTH - 1) * BTN_ITEM_SIZE_WIDTH + 10, this->maxHeight()));
+ m_scrollIsShow = true;
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ } else {
+ setFixedSize(QSize(rect.width() / BTN_ITEM_SIZE_WIDTH * BTN_ITEM_SIZE_WIDTH + 10, this->maxHeight()));
+ m_scrollIsShow = true;
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ }
}
}
}

1
debian/patches/series vendored
View File

@ -50,3 +50,4 @@
0050-92-fixbug.patch
0051-95-tab.patch
0052-94.patch
0053-97-fixbug.patch