Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 任务栏蓝牙图标tips信息显示异常

Browse Source 
tips文案间隔设置错误

Log: 修复任务栏蓝牙图标tips信息显示异常的问题
Bug: https://pms.uniontech.com/bug-view-120873.html
Influence: tips文案
Change-Id: I82d9e9928cc38a2dfa441ffad52b422957387fbb
This commit is contained in:
Zhang Qipeng 2022-04-18 18:20:58 +08:00 committed by zhangqipeng
parent 7b625b1ab7
commit 001ab4c907
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/tipswidget.cpp
View File

@ -46,11 +46,11 @@ void TipsWidget::setTextList(const QStringList &textList)
int width = 0; int width = 0;
int height = 0; int height = 0;
for (QString text : m_textList) { for (QString text : m_textList) {
width = qMax(width, fontMetrics().width(text) + 20); width = qMax(width, fontMetrics().width(text));
height += fontMetrics().boundingRect(text).height(); height += fontMetrics().boundingRect(text).height();
} }
setFixedSize(width, height); setFixedSize(width + 20, height);
update(); update();
} }
@ -75,16 +75,18 @@ void TipsWidget::paintEvent(QPaintEvent *event)
} }
break; break;
case MultiLine: { case MultiLine: {
int y = 0; int x = rect().x();
if (m_textList.size() != 1) int y = rect().y();
if (m_textList.size() != 1) {
x += 10;
option.setAlignment(Qt::AlignLeft | Qt::AlignVCenter); option.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
}
for (QString text : m_textList) { for (QString text : m_textList) {
int lineHeight = fontMetrics().boundingRect(text).height(); int lineHeight = fontMetrics().boundingRect(text).height();
painter.drawText(QRect(0, y, rect().width(), lineHeight), text, option); painter.drawText(QRect(x, y, rect().width(), lineHeight), text, option);
y += lineHeight; y += lineHeight;
} }
} } break;
break;
} }
} }