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: 修复修改日期点击确认后左下角日期突然变小的问题

Browse Source 
藏语字体情况下，绘制文本对齐方式会异常，目前采用居中绘制加向中间偏移的方式达成效果

Log: 修复日期在藏语下显示不正确的问题
Bug: https://pms.uniontech.com/zentao/bug-view-78847.html
Change-Id: Ib5c9d8dc2a0575c6667c894eeb657e51fd247c24
This commit is contained in:
Fan PengCheng 2021-05-13 10:33:23 +08:00
parent 8ad3d835ed
commit 5b552ae39a
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
plugins/datetime/datetimewidget.cpp
View File

@ -140,28 +140,28 @@ QSize DatetimeWidget::curTimeSize() const
QSize dateSize = QFontMetrics(m_dateFont).boundingRect("0000/00/00").size(); QSize dateSize = QFontMetrics(m_dateFont).boundingRect("0000/00/00").size();
if (position == Dock::Bottom || position == Dock::Top) { if (position == Dock::Bottom || position == Dock::Top) {
while (QFontMetrics(m_timeFont).boundingRect(timeString).height() + QFontMetrics(m_dateFont).boundingRect("0000/00/00").height() > height()) {
if (m_timeFont.pixelSize() > (m_timeRect.height() / 2) || m_dateFont.pixelSize() > (m_dateRect.height() / 2)) { m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1);
m_timeFont.setPixelSize(m_timeRect.height() / 2 - 1);
m_dateFont.setPixelSize(m_dateRect.height() / 2 - 1);
timeSize.setWidth(QFontMetrics(m_timeFont).boundingRect(timeString).size().width()); timeSize.setWidth(QFontMetrics(m_timeFont).boundingRect(timeString).size().width());
dateSize.setWidth(QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width()); if (m_timeFont.pixelSize() - m_dateFont.pixelSize() == 1) {
m_dateFont.setPixelSize(m_dateFont.pixelSize() - 1);
dateSize.setWidth(QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width());
}
} }
return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height()); return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height());
} else { } else {
while (std::max(QFontMetrics(m_timeFont).boundingRect(timeString).size().width(), QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width()) > (width() - 4)) {
if (m_timeFont.pixelSize() > (m_timeRect.height() / 3) || m_dateFont.pixelSize() > (m_dateRect.height() / 4)) { m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1);
if (m_24HourFormat) {
m_timeFont.setPixelSize(m_timeRect.height() / 3 - 1); timeSize.setHeight(QFontMetrics(m_timeFont).boundingRect(timeString).size().height());
m_dateFont.setPixelSize(m_dateRect.height() / 4 + 2); } else {
timeSize.setWidth(QFontMetrics(m_timeFont).boundingRect(timeString).size().width()); timeSize.setHeight(QFontMetrics(m_timeFont).boundingRect(timeString).size().height() * 2);
dateSize.setWidth(QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width()); }
if (m_timeFont.pixelSize() - m_dateFont.pixelSize() == 1) {
m_dateFont.setPixelSize(m_dateFont.pixelSize() - 1);
dateSize.setWidth(QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().height());
}
} }
m_timeOffset = (timeSize.height() - dateSize.height()) / 2 ; m_timeOffset = (timeSize.height() - dateSize.height()) / 2 ;
return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height()); return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height());
} }
@ -175,12 +175,15 @@ QSize DatetimeWidget::sizeHint() const
void DatetimeWidget::paintEvent(QPaintEvent *e) void DatetimeWidget::paintEvent(QPaintEvent *e)
{ {
Q_UNUSED(e); Q_UNUSED(e);
const QDateTime current = QDateTime::currentDateTime(); const QDateTime current = QDateTime::currentDateTime();
const Dock::Position position = qApp->property(PROP_POSITION).value<Dock::Position>(); const Dock::Position position = qApp->property(PROP_POSITION).value<Dock::Position>();
QPainter painter(this); QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing); painter.setRenderHint(QPainter::Antialiasing);
painter.setPen(QPen(palette().brightText(), 1));
QRect timeRect = rect();
QRect dateRect = rect();
QString format = m_shortTimeFormat; QString format = m_shortTimeFormat;
if (!m_24HourFormat) { if (!m_24HourFormat) {
@ -189,22 +192,21 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
else else
format = format.append("\nAP"); format = format.append("\nAP");
} }
QString timeStr = current.toString(format);
painter.setFont(m_timeFont); format = m_shortDateFormat;
painter.setPen(QPen(palette().brightText(), 1)); QString dateStr = current.toString(format);
m_timeRect = rect();
m_dateRect = rect();
if (position == Dock::Top || position == Dock::Bottom) { if (position == Dock::Top || position == Dock::Bottom) {
m_timeRect.setBottom(rect().center().y() + 6); timeRect.setBottom(rect().top() + QFontMetrics(m_timeFont).boundingRect(timeStr).height() + 6);
m_dateRect.setTop(m_timeRect.bottom() - 4); dateRect.setTop(timeRect.bottom() - 4);
} else { } else {
m_timeRect.setBottom(rect().center().y() + m_timeOffset); timeRect.setBottom(rect().center().y() + m_timeOffset);
m_dateRect.setTop(m_timeRect.bottom()); dateRect.setTop(timeRect.bottom());
} }
painter.drawText(m_timeRect, Qt::AlignBottom | Qt::AlignHCenter, current.toString(format)); painter.setFont(m_timeFont);
format = m_shortDateFormat; painter.drawText(timeRect, Qt::AlignCenter, timeStr);
painter.setFont(m_dateFont); painter.setFont(m_dateFont);
painter.drawText(m_dateRect, Qt::AlignTop | Qt::AlignHCenter, current.toString(format)); painter.drawText(dateRect, Qt::AlignCenter, dateStr);
} }

2
plugins/datetime/datetimewidget.h
View File

@ -60,8 +60,6 @@ private:
Timedate *m_timedateInter; Timedate *m_timedateInter;
QString m_shortDateFormat; QString m_shortDateFormat;
QString m_shortTimeFormat; QString m_shortTimeFormat;
QRect m_timeRect;
QRect m_dateRect;
}; };