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

fix(dock):Font set to 20, incomplete date display in taskbar efficient mode

Browse Source 
字体设置到20，任务栏高效模式下日期显示不完整 for bug:12080
This commit is contained in:
chenzhe 2020-01-13 17:59:55 +08:00
parent 086aca92cc
commit 36376dfbd1
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/datetime/datetimewidget.cpp
View File

@ -71,6 +71,7 @@ QSize DatetimeWidget::curTimeSize() const
const Dock::Position position = qApp->property(PROP_POSITION).value<Dock::Position>(); const Dock::Position position = qApp->property(PROP_POSITION).value<Dock::Position>();
m_timeFont = TIME_FONT; m_timeFont = TIME_FONT;
m_dateFont = DATE_FONT;
QFontMetrics fm(m_timeFont); QFontMetrics fm(m_timeFont);
QString format; QString format;
if (m_24HourFormat) if (m_24HourFormat)
@ -88,12 +89,26 @@ QSize DatetimeWidget::curTimeSize() const
QStringList SL = timeString.split("\n"); QStringList SL = timeString.split("\n");
timeSize = QSize(fm.boundingRect(SL.at(0)).width(), fm.boundingRect(SL.at(0)).height() + fm.boundingRect(SL.at(1)).height()); timeSize = QSize(fm.boundingRect(SL.at(0)).width(), fm.boundingRect(SL.at(0)).height() + fm.boundingRect(SL.at(1)).height());
} else { } else {
QSize dateSize = QFontMetrics(DATE_FONT).boundingRect("0000/00/00").size(); QSize dateSize = QFontMetrics(m_dateFont).boundingRect("0000/00/00").size();
if (timeSize.width() < dateSize.width()) if (timeSize.width() < dateSize.width() && rect().height() >= SHOW_DATE_MIN_HEIGHT)
timeSize.setWidth(dateSize.width()); timeSize.setWidth(dateSize.width());
} }
if (position == Dock::Bottom || position == Dock::Top) { if (position == Dock::Bottom || position == Dock::Top) {
if (rect().height() >= SHOW_DATE_MIN_HEIGHT) {
QStringList SL = timeString.split("\n");
int date_dec=m_timeFont.pixelSize()-m_dateFont.pixelSize();
while (QFontMetrics(m_timeFont).boundingRect(timeString).size().height() + 11 > height()) {
m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1);
m_dateFont.setPixelSize(m_timeFont.pixelSize() - date_dec);
}
} else {
while (QFontMetrics(m_timeFont).boundingRect(timeString).size().height() > height() + 10) {
m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1);
}
timeSize.setWidth(QFontMetrics(m_timeFont).boundingRect(timeString).size().width());
}
return QSize(timeSize.width(), height()); return QSize(timeSize.width(), height());
} else { } else {
if (width() < timeSize.width()) { if (width() < timeSize.width()) {
@ -158,6 +173,7 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
painter.setPen(QPen(palette().brightText(), 1)); painter.setPen(QPen(palette().brightText(), 1));
if (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);
@ -167,7 +183,7 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
QRect dateRect = rect(); QRect dateRect = rect();
dateRect.setTop(timeRect.bottom()); dateRect.setTop(timeRect.bottom());
format = "yyyy/MM/dd"; format = "yyyy/MM/dd";
painter.setFont(DATE_FONT); painter.setFont(m_dateFont);
painter.drawText(dateRect, Qt::AlignTop | Qt::AlignHCenter, current.toString(format)); painter.drawText(dateRect, Qt::AlignTop | Qt::AlignHCenter, current.toString(format));
} else { } else {
painter.drawText(rect(), Qt::AlignVCenter | Qt::AlignHCenter, current.toString(format)); painter.drawText(rect(), Qt::AlignVCenter | Qt::AlignHCenter, current.toString(format));

1
plugins/datetime/datetimewidget.h
View File

@ -49,6 +49,7 @@ private:
bool m_24HourFormat; bool m_24HourFormat;
int m_timeOffset; int m_timeOffset;
mutable QFont m_timeFont; mutable QFont m_timeFont;
mutable QFont m_dateFont;
}; };
#endif // DATETIMEWIDGET_H #endif // DATETIMEWIDGET_H