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

feat(datetime):change datetime font and format

Browse Source
This commit is contained in:
shaojun 2019-09-03 09:37:24 +08:00
parent 39b2f3af79
commit 9d169bf64c
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/datetime/datetimewidget.cpp
View File

@ -27,14 +27,25 @@
#include <QDebug> #include <QDebug>
#include <QSvgRenderer> #include <QSvgRenderer>
#include <QMouseEvent> #include <QMouseEvent>
#include <DFontSizeManager>
#define PLUGIN_STATE_KEY "enable" #define PLUGIN_STATE_KEY "enable"
#define SHOW_DATE_MIN_HEIGHT 45 #define SHOW_DATE_MIN_HEIGHT 45
#define TIME_FONT DFontSizeManager::instance()->t5()
#define DATE_FONT DFontSizeManager::instance()->t10()
DWIDGET_USE_NAMESPACE
DatetimeWidget::DatetimeWidget(QWidget *parent) DatetimeWidget::DatetimeWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
QFontMetrics fm_time(TIME_FONT);
int timeHeight = fm_time.boundingRect("88:88").height();
QFontMetrics fm_date(DATE_FONT);
int dateHeight = fm_date.boundingRect("8888/88/88").height();
m_timeOffset = (timeHeight - dateHeight) / 2;
} }
void DatetimeWidget::set24HourFormat(const bool value) void DatetimeWidget::set24HourFormat(const bool value)
@ -54,20 +65,12 @@ void DatetimeWidget::set24HourFormat(const bool value)
QSize DatetimeWidget::sizeHint() const QSize DatetimeWidget::sizeHint() const
{ {
const Dock::DisplayMode displayMode = qApp->property(PROP_DISPLAY_MODE).value<Dock::DisplayMode>();
QFontMetrics fm(qApp->font()); QFontMetrics fm(qApp->font());
QString timeString;
if (m_24HourFormat) if (m_24HourFormat)
timeString = "88:88"; return fm.boundingRect("8888/88/88").size() + QSize(20, 10);
else else
timeString = "88:88 A.A."; return fm.boundingRect("88:88 A.A.").size() + QSize(20, 20);
if (displayMode == Dock::Fashion && rect().height() > SHOW_DATE_MIN_HEIGHT)
timeString += "\n8888-88-88";
return fm.size(Qt::TextExpandTabs, timeString) + QSize(20, 20);
} }
void DatetimeWidget::resizeEvent(QResizeEvent *e) void DatetimeWidget::resizeEvent(QResizeEvent *e)
@ -93,11 +96,23 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
else else
format = "hh:mm AP"; format = "hh:mm AP";
if (displayMode == Dock::Fashion && rect().height() > SHOW_DATE_MIN_HEIGHT)
format += "\nyyyy-MM-dd";
painter.setPen(Qt::white); painter.setPen(Qt::white);
painter.drawText(rect(), Qt::AlignCenter, current.toString(format));
if (displayMode == Dock::Fashion && rect().height() > SHOW_DATE_MIN_HEIGHT) {
QRect timeRect = rect();
timeRect.setBottom(rect().center().y() + m_timeOffset);
painter.setFont(TIME_FONT);
painter.drawText(timeRect, Qt::AlignBottom | Qt::AlignHCenter, current.toString(format));
QRect dateRect = rect();
dateRect.setTop(timeRect.bottom());
format = "yyyy/MM/dd";
painter.setFont(DATE_FONT);
painter.drawText(dateRect, Qt::AlignTop | Qt::AlignHCenter, current.toString(format));
} else {
painter.drawText(rect(), Qt::AlignCenter, current.toString(format));
}
} }
const QPixmap DatetimeWidget::loadSvg(const QString &fileName, const QSize size) const QPixmap DatetimeWidget::loadSvg(const QString &fileName, const QSize size)

1
plugins/datetime/datetimewidget.h
View File

@ -48,6 +48,7 @@ private:
private: private:
bool m_24HourFormat; bool m_24HourFormat;
int m_timeOffset;
}; };
#endif // DATETIMEWIDGET_H #endif // DATETIMEWIDGET_H