Skip to content

sync: from linuxdeepin/dde-session-shell #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepin-ci-robot wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −4
Open

sync: from linuxdeepin/dde-session-shell #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/snipe/dde-lock.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Comment=Deepin Lock
Encoding=UTF-8
Exec=/usr/bin/dde-lock
NoDisplay=true
OnlyShowIn=DDE
OnlyShowIn=DDE;Deepin
Type=Application
X-Deepin-Vendor=user-custom
X-Deepin-TurboType=dtkwidget
Expand Down
27 changes: 24 additions & 3 deletions src/widgets/dlineeditex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,15 @@ void DLineEditEx::setPlaceholderTextFont(const QFont &font)
{
const QString &text = lineEdit()->placeholderText();
QFont fontTmp = font;
while (QFontMetrics(fontTmp).boundingRect(text).width() > width()) {
// 计算有效文本宽度（扣除 textMargins + layout contentsMargins）
QMargins textMargins = lineEdit()->textMargins();
QMargins layoutMargins(0, 0, 0, 0);
if (auto *layout = lineEdit()->layout()) {
layoutMargins = layout->contentsMargins();
}
int availWidth = width() - textMargins.left() - textMargins.right()
- layoutMargins.left() - layoutMargins.right();
while (QFontMetrics(fontTmp).boundingRect(text).width() > availWidth) {
// 防止陷入死循环，setPointSize当参数为负数的时候设置不生效
// TODO: font()获取问题，需要继续调查下为啥font为啥会出问题，但是这里也需要增加跳出死循环的条件
qDebug() << "Password line edit placeholder text width : " << QFontMetrics(fontTmp).boundingRect(text).width() << " line edit width : " << width();
Expand Down Expand Up @@ -160,8 +168,21 @@ void DLineEditEx::paintEvent(QPaintEvent *event)
// 使用 elidedText 确保文本过长时在右侧显示省略号，而不是换行
QFontMetrics fm(pa.font());
const QString &placeholderText = lineEdit()->placeholderText();
QString elidedText = fm.elidedText(placeholderText, Qt::ElideRight, rect().width());
pa.drawText(rect(), Qt::AlignCenter | Qt::TextSingleLine, elidedText);
// 读取内部 QLineEdit 的 textMargins 和 layout contentsMargins，计算扣除图标区域后的有效文本 rect
// 避免占位文本与右侧图标（大写状态、密码显示、密码提示等）重叠
QRect leRect = lineEdit()->geometry();
QMargins textMargins = lineEdit()->textMargins();
QMargins layoutMargins(0, 0, 0, 0);
if (auto *layout = lineEdit()->layout()) {
layoutMargins = layout->contentsMargins();
}
int leftOffset = textMargins.left() + layoutMargins.left();
int rightOffset = textMargins.right() + layoutMargins.right();
QRect textRect(leRect.x() + leftOffset, rect().y(),
leRect.width() - leftOffset - rightOffset,
rect().height());
QString elidedText = fm.elidedText(placeholderText, Qt::ElideRight, textRect.width());
pa.drawText(textRect, Qt::AlignCenter | Qt::TextSingleLine, elidedText);

// 当文本被省略时，设置 tooltip 显示完整文本
if (elidedText != placeholderText) {
Expand Down
Loading