diff --git a/frame/window/components/datetimedisplayer.cpp b/frame/window/components/datetimedisplayer.cpp index 4dc48140d..d70d25eba 100644 --- a/frame/window/components/datetimedisplayer.cpp +++ b/frame/window/components/datetimedisplayer.cpp @@ -94,6 +94,12 @@ void DateTimeDisplayer::initDConfig() m_shortDateFormatStr = currentLocale.dateFormat(QLocale::ShortFormat); } + if (!m_config->isDefaultValue(shortDateFormat_key)) { + m_longDateFormatStr = m_config->value(longDateFormat_key).toString(); + } else { + m_longDateFormatStr = currentLocale.dateFormat(QLocale::LongFormat); + } + if (!m_config->isDefaultValue(shortTimeFormat_key)) { m_shortTimeFormatStr = m_config->value(shortTimeFormat_key).toString(); } else { @@ -106,12 +112,6 @@ void DateTimeDisplayer::initDConfig() m_longTimeFormatStr = currentLocale.timeFormat(QLocale::LongFormat); } - if (!m_config->isDefaultValue(longDateFormat_key)) { - m_longDateFormatStr = m_config->value(longDateFormat_key).toString(); - } else { - m_longTimeFormatStr = currentLocale.dateFormat(QLocale::LongFormat); - } - connect(m_config, &DTK_CORE_NAMESPACE::DConfig::valueChanged, this, [this] (const QString &key) { if (key == shortDateFormat_key) { m_shortDateFormatStr = m_config->value(key).toString();