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

!103 fixbug 

Merge pull request !103 from 杨敏/openkylin/nile
This commit is contained in:
杨敏 2024-10-25 02:07:28 +00:00 committed by Gitee
parent ad20c2b2b8 19f601c92c
commit b449e3e644
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 23 additions and 5 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-ok34~1025) nile; urgency=medium
* BUG号：#I8WAN0 锁屏和登录界面的自定义认证登录框位置偏移
* 需求号：无
* 其他改动说明：无
* 其他改动影响域：无
-- Yang Min <yangmin@kylinos.cn> Fri, 25 Oct 2024 10:05:32 +0800
ukui-screensaver (4.10.0.0-ok33~1018) nile; urgency=medium
* BUG号：#IAY042 锁屏界面点击电源按钮，休眠图标不正确

19
src/widgets/authdialog.cpp
View File

@ -38,12 +38,13 @@
#include "global_utils.h"
#define WIDGET_HEIGHT_HEADTIP (40)
#define WIDGET_HEIGHT_HEADIMAGE (154 * scale)
#define WIDGET_HEIGHT_HEADIMAGE ((int)(154 * scale))
#define WIDGET_HEIGHT_USERNAME (40)
#define WIDGET_HEIGHT_PASSWDEDIT (80)
#define WIDGET_HEIGHT_SPACING (16 * scale)
#define WIDGET_HEIGHT_SPACING ((int)(16 * scale))
#define WIDGET_HEIGHT_CUSTOM \
(WIDGET_HEIGHT_HEADIMAGE + WIDGET_HEIGHT_USERNAME + WIDGET_HEIGHT_PASSWDEDIT + WIDGET_HEIGHT_SPACING * 2)
(WIDGET_HEIGHT_HEADTIP + WIDGET_HEIGHT_HEADIMAGE + WIDGET_HEIGHT_USERNAME + WIDGET_HEIGHT_PASSWDEDIT \
+ WIDGET_HEIGHT_SPACING * 3)
#define WIDGET_HEIGHT_LOGINOPTS (104)
AuthDialog::AuthDialog(LockDialogModel *model, UserInfoPtr userInfo, QWidget *parent)
@ -436,10 +437,11 @@ void AuthDialog::initLoginoptionWidget()
void AuthDialog::initCustomAuthWidget()
{
if (m_customWidget) {
m_layoutCustom = new QHBoxLayout(m_customWidget);
m_layoutCustom = new QHBoxLayout();
m_layoutCustom->setSpacing(0);
m_layoutCustom->setContentsMargins(0, 0, 0, 0);
m_layoutCustom->setAlignment(Qt::AlignVCenter);
m_layoutCustom->setAlignment(Qt::AlignCenter);
m_customWidget->setLayout(m_layoutCustom);
m_customWidget->hide();
}
}
@ -533,6 +535,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
{
switch (uLoginOptType) {
case LOGINOPT_TYPE_PASSWORD: {
m_tipWidget->show();
m_editWidget->show();
m_headerWidget->show();
m_nameWidget->show();
@ -546,6 +549,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
setFocusProxy(m_passwordEdit);
} break;
case LOGINOPT_TYPE_FACE: {
m_tipWidget->show();
m_editWidget->show();
m_headerWidget->show();
m_nameWidget->show();
@ -565,6 +569,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
case LOGINOPT_TYPE_VOICEPRINT:
case LOGINOPT_TYPE_FINGERVEIN:
case LOGINOPT_TYPE_IRIS: {
m_tipWidget->show();
m_editWidget->show();
m_headerWidget->show();
m_nameWidget->show();
@ -578,6 +583,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
setFocusProxy(m_passwordEdit);
} break;
case LOGINOPT_TYPE_QRCODE: {
m_tipWidget->show();
m_editWidget->show();
m_headerWidget->show();
m_nameWidget->show();
@ -592,6 +598,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
setFocusProxy(m_passwordEdit);
} break;
case LOGINOPT_TYPE_GENERAL_UKEY: {
m_tipWidget->show();
m_editWidget->show();
m_headerWidget->show();
m_nameWidget->show();
@ -607,6 +614,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
m_ukeyPasswordEdit->setFocus();
} break;
case LOGINOPT_TYPE_CUSTOM: {
m_tipWidget->hide();
m_editWidget->hide();
m_headerWidget->hide();
m_nameWidget->hide();
@ -631,6 +639,7 @@ void AuthDialog::switchLoginOptType(unsigned uLoginOptType, bool faceBtnClicked)
connect(obj, SIGNAL(getLoginPluginEnv()), this, SLOT(onCustomPlugEnv()));
}
setFocusProxy(authWidget);
authWidget->setFixedSize(m_customWidget->size());
authWidget->setFocus();
authWidget->show();
}