Skip to content

Commit 7097ae7

Browse files
tsic404deepin-bot[bot]
authored andcommitted
fix: error datetime tooltip
issue: linuxdeepin/developer-center#7056 log: correct longtimeformat and timeformat str
1 parent 3939ca9 commit 7097ae7

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

frame/window/components/datetimedisplayer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ void DateTimeDisplayer::initDConfig()
9494
m_shortDateFormatStr = currentLocale.dateFormat(QLocale::ShortFormat);
9595
}
9696

97+
if (!m_config->isDefaultValue(shortDateFormat_key)) {
98+
m_longDateFormatStr = m_config->value(longDateFormat_key).toString();
99+
} else {
100+
m_longDateFormatStr = currentLocale.dateFormat(QLocale::LongFormat);
101+
}
102+
97103
if (!m_config->isDefaultValue(shortTimeFormat_key)) {
98104
m_shortTimeFormatStr = m_config->value(shortTimeFormat_key).toString();
99105
} else {
@@ -106,12 +112,6 @@ void DateTimeDisplayer::initDConfig()
106112
m_longTimeFormatStr = currentLocale.timeFormat(QLocale::LongFormat);
107113
}
108114

109-
if (!m_config->isDefaultValue(longDateFormat_key)) {
110-
m_longDateFormatStr = m_config->value(longDateFormat_key).toString();
111-
} else {
112-
m_longTimeFormatStr = currentLocale.dateFormat(QLocale::LongFormat);
113-
}
114-
115115
connect(m_config, &DTK_CORE_NAMESPACE::DConfig::valueChanged, this, [this] (const QString &key) {
116116
if (key == shortDateFormat_key) {
117117
m_shortDateFormatStr = m_config->value(key).toString();

0 commit comments

Comments
 (0)