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

fixed(dock): fixed bug 5541

Browse Source
This commit is contained in:
wangxuwen 2019-11-06 16:22:19 +08:00
parent f95fe5bb8b
commit b5bba30e16
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/datetime/datetimewidget.cpp
View File

@ -58,9 +58,9 @@ void DatetimeWidget::set24HourFormat(const bool value)
} }
m_24HourFormat = value; m_24HourFormat = value;
update(); update();
adjustSize();
if (isVisible()) { if (isVisible()) {
emit requestUpdateGeometry(); emit requestUpdateGeometry();
} }
@ -94,7 +94,7 @@ QSize DatetimeWidget::curTimeSize() const
} }
if (position == Dock::Bottom || position == Dock::Top) { if (position == Dock::Bottom || position == Dock::Top) {
return QSize(timeSize.width(), DOCK_MAX_SIZE); return QSize(timeSize.width(), height());
} else { } else {
if (width() < timeSize.width()) { if (width() < timeSize.width()) {
if (timeString.contains("\n")) { if (timeString.contains("\n")) {
@ -114,10 +114,10 @@ QSize DatetimeWidget::curTimeSize() const
timeHeight = QFontMetrics(m_timeFont).boundingRect(SL.at(0)).size().height() + QFontMetrics(m_timeFont).boundingRect(SL.at(1)).size().height(); timeHeight = QFontMetrics(m_timeFont).boundingRect(SL.at(0)).size().height() + QFontMetrics(m_timeFont).boundingRect(SL.at(1)).size().height();
} }
return QSize(DOCK_MAX_SIZE, std::max(timeHeight, PLUGIN_BACKGROUND_MIN_SIZE)); return QSize(width(), std::max(timeHeight, PLUGIN_BACKGROUND_MIN_SIZE));
} else { } else {
return QSize(DOCK_MAX_SIZE, std::max(timeSize.height(), SHOW_DATE_MIN_HEIGHT)); return QSize(width(), std::max(timeSize.height(), SHOW_DATE_MIN_HEIGHT));
} }
} }
} }