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

feat(dock): correct the date dispaly

Browse Source
This commit is contained in:
wangxuwen 2019-09-04 18:13:25 +08:00
parent 7c71d13cc0
commit 2797bab749
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/datetime/datetimewidget.cpp
View File

@ -68,9 +68,9 @@ QSize DatetimeWidget::sizeHint() const
QFontMetrics fm(qApp->font()); QFontMetrics fm(qApp->font());
if (m_24HourFormat) if (m_24HourFormat)
return fm.boundingRect("8888/88/88").size() + QSize(20, 10); return fm.boundingRect("8888/88/88").size() + QSize(30, 10);
else else
return fm.boundingRect("88:88 A.A.").size() + QSize(20, 20); return fm.boundingRect("88:88 A.A.").size() + QSize(30, 20);
} }
void DatetimeWidget::resizeEvent(QResizeEvent *e) void DatetimeWidget::resizeEvent(QResizeEvent *e)
@ -98,7 +98,7 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
painter.setPen(Qt::white); painter.setPen(Qt::white);
if (displayMode == Dock::Fashion && rect().height() > SHOW_DATE_MIN_HEIGHT) { if (rect().height() > SHOW_DATE_MIN_HEIGHT) {
QRect timeRect = rect(); QRect timeRect = rect();
timeRect.setBottom(rect().center().y() + m_timeOffset); timeRect.setBottom(rect().center().y() + m_timeOffset);
painter.setFont(TIME_FONT); painter.setFont(TIME_FONT);