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

feat(datetime):adjust sizehint while font change

Browse Source
This commit is contained in:
shaojun 2019-09-11 16:28:21 +08:00
parent bb00071d5b
commit 6fefd68e88
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

@ -98,7 +98,7 @@ QSize DatetimeWidget::curTimeSize() const
return QSize(DOCK_MAX_SIZE, std::max(timeHeight, PLUGIN_BACKGROUND_MIN_SIZE));
} else {
return QSize(DOCK_MAX_SIZE, timeSize.height() + dateSize.height());
return QSize(DOCK_MAX_SIZE, std::max(timeSize.height() + dateSize.height(), SHOW_DATE_MIN_HEIGHT));
}
}
}
@ -110,7 +110,7 @@ QSize DatetimeWidget::sizeHint() const
void DatetimeWidget::resizeEvent(QResizeEvent *e)
{
setMaximumSize(curTimeSize());
setMaximumSize(curTimeSize() + QSize(1, 1));
QWidget::resizeEvent(e);
}
@ -133,7 +133,7 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
painter.setPen(Qt::white);
painter.setFont(m_timeFont);
if (rect().height() > SHOW_DATE_MIN_HEIGHT) {
if (rect().height() >= SHOW_DATE_MIN_HEIGHT) {
QRect timeRect = rect();
timeRect.setBottom(rect().center().y() + m_timeOffset);
painter.drawText(timeRect, Qt::AlignBottom | Qt::AlignHCenter, current.toString(format));