fix: clock drawing error

以本地时间为基准比较diff Log: linuxdeepin/developer-center#5196
linuxdeepin · Aug 23, 2023 · 62cdf20 · 62cdf20
1 parent 29dd4e5
commit 62cdf20
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/worldclock/clock.cpp b/worldclock/clock.cpp
@@ -55,7 +55,7 @@ void Clock::paint(QPainter *painter, const QRect &rect)
  m_clockPointSize = basePointSize * ratio;
 
  QDateTime datetime(QDateTime::currentDateTime());
- datetime = datetime.addSecs(datetime.offsetFromUtc() - m_utcOffset);
+ datetime = datetime.addSecs(timeDiff(m_utcOffset, datetime));
  const QTime time(datetime.time());
 
  const bool nightMode = !(time.hour() >= 6 && time.hour() < 18);
@@ -116,6 +116,15 @@ void Clock::paint(QPainter *painter, const QRect &rect)
  }
 }
 
+int Clock::timeDiff(int utcOffset, const QDateTime &localTime)
+{
+ if (!localTime.isValid()) {
+ QDateTime *currentTime = const_cast<QDateTime *>(&localTime);
+ *currentTime = QDateTime::currentDateTime();
+ }
+ return utcOffset - localTime.offsetFromUtc();
+}
+
 void Clock::setUTCOffset(const int utcOffset)
 {
  if (m_utcOffset == utcOffset)

diff --git a/worldclock/clock.h b/worldclock/clock.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <QDateTime>
 #include <QFont>
 #include <QPixmap>
 
@@ -19,6 +20,8 @@ class Clock
 
  void paint(QPainter *painter, const QRect &rect);
 
+ static int timeDiff(int utcOffset, const QDateTime &localTime = QDateTime());
+
 private:
  void updateClockPixmap(const bool isNightMode);
  void updateLocationFont();

diff --git a/worldclock/clockpanel.cpp b/worldclock/clockpanel.cpp
@@ -137,16 +137,15 @@ void ClockDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
 QString ClockDelegate::utcOffsetText(const int offset) const
 {
- const QDateTime localTime(QDateTime::currentDateTime());
- const int time = (offset - localTime.offsetFromUtc()) / 3600;
+ const int time = (Clock::timeDiff(offset)) / 3600;
  return QString("%1%2h").arg(time > 0 ? "+" : "").arg(time);
 }
 
 QString ClockDelegate::promptOfUtcOffsetText(const int offset) const
 {
  const QDateTime localTime(QDateTime::currentDateTime());
 
- const double timeDelta = (offset - localTime.offsetFromUtc()) / 3600.0;
+ const double timeDelta = (Clock::timeDiff(offset, localTime)) / 3600.0;
 
  QString dateLiteral;
  if (localTime.time().hour() + timeDelta >= 24) {