From bb771d5797c255c08e634d91b953eeabe1ba3a14 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Thu, 4 Apr 2024 12:24:57 +0200
Subject: [PATCH] fix unwanted horizontal scrollbar

---
 src/librssguard/gui/messagesview.cpp          | 78 ++++---------------
 src/librssguard/miscellaneous/textfactory.cpp |  5 ++
 2 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index 9d0620943..4a2b36cc1 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -80,27 +80,6 @@ QByteArray MessagesView::saveHeaderState() const {
   }
 
   return QJsonDocument(obj).toJson(QJsonDocument::JsonFormat::Compact);
-
-  /*
-   *
-   *
-    QByteArray arr;
-  QDataStream outt(&arr, QIODevice::OpenModeFlag::WriteOnly);
-
-  outt.setVersion(QDataStream::Version::Qt_4_7);
-  outt << header()->count();
-  outt << int(header()->sortIndicatorOrder());
-  outt << header()->sortIndicatorSection();
-
-  // Save column data.
-  for (int i = 0; i < header()->count(); i++) {
-    outt << header()->visualIndex(i);
-    outt << header()->sectionSize(i);
-    outt << header()->isSectionHidden(i);
-  }
-
-  return arr;
-  */
 }
 
 void MessagesView::restoreHeaderState(const QByteArray& dta) {
@@ -112,6 +91,8 @@ void MessagesView::restoreHeaderState(const QByteArray& dta) {
     return;
   }
 
+  int last_visible_column = 0;
+
   // Restore column attributes.
   for (int i = 0; i < saved_header_count && i < header()->count(); i++) {
     int vi = obj[QSL("header_%1_idx").arg(i)].toInt();
@@ -124,8 +105,17 @@ void MessagesView::restoreHeaderState(const QByteArray& dta) {
 
     header()->resizeSection(i, ss);
     header()->setSectionHidden(i, ish);
+
+    if (!ish && vi > last_visible_column) {
+      last_visible_column = vi;
+    }
   }
 
+  // All columns are resizeable but last one is set to auto-stretch to fill remaining
+  // space. Sometimes this column is saved as too wide and causes
+  // horizontal scrollbar to appear. Therefore downsize it.
+  header()->resizeSection(header()->logicalIndex(last_visible_column), 1);
+
   // Restore sort attributes.
   int saved_sort_count = obj[QSL("sort_count")].toInt();
 
@@ -147,48 +137,6 @@ void MessagesView::restoreHeaderState(const QByteArray& dta) {
       header()->setSortIndicator(newest_col, newest_ordr);
     }
   }
-
-  /*
-  QByteArray arr = dta;
-  QDataStream inn(&arr, QIODevice::OpenModeFlag::ReadOnly);
-
-  inn.setVersion(QDataStream::Version::Qt_4_7);
-
-  int saved_header_count;
-  inn >> saved_header_count;
-
-  if (std::abs(saved_header_count - header()->count()) > 10) {
-    qWarningNN << LOGSEC_GUI << "Detected invalid state for list view.";
-    return;
-  }
-
-  int saved_sort_order;
-  inn >> saved_sort_order;
-  int saved_sort_column;
-  inn >> saved_sort_column;
-
-  for (int i = 0; i < saved_header_count && i < header()->count(); i++) {
-    int vi, ss;
-    bool ish;
-
-    inn >> vi;
-    inn >> ss;
-    inn >> ish;
-
-    // auto ax = m_sourceModel->headerData(i, Qt::Orientation::Horizontal, Qt::ItemDataRole::DisplayRole).toString();
-
-    if (vi < header()->count()) {
-      header()->swapSections(header()->visualIndex(i), vi);
-    }
-
-    header()->resizeSection(i, ss);
-    header()->setSectionHidden(i, ish);
-  }
-
-  if (saved_sort_column < header()->count()) {
-    header()->setSortIndicator(saved_sort_column, Qt::SortOrder(saved_sort_order));
-  }
-  */
 }
 
 void MessagesView::copyUrlOfSelectedArticles() const {
@@ -907,6 +855,8 @@ void MessagesView::openSelectedMessagesWithExternalTool() {
 }
 
 void MessagesView::adjustColumns() {
+  qDebugNN << LOGSEC_GUI << "Article list header geometries changed.";
+
   if (header()->count() > 0 && !m_columnsAdjusted) {
     m_columnsAdjusted = true;
 
@@ -915,8 +865,6 @@ void MessagesView::adjustColumns() {
       header()->setSectionResizeMode(i, QHeaderView::ResizeMode::Interactive);
     }
 
-    // header()->setSectionResizeMode(MSG_DB_TITLE_INDEX, QHeaderView::ResizeMode::Stretch);
-
     // Hide columns.
     hideColumn(MSG_DB_ID_INDEX);
     hideColumn(MSG_DB_DELETED_INDEX);
diff --git a/src/librssguard/miscellaneous/textfactory.cpp b/src/librssguard/miscellaneous/textfactory.cpp
index cfa629e0f..7384082d7 100644
--- a/src/librssguard/miscellaneous/textfactory.cpp
+++ b/src/librssguard/miscellaneous/textfactory.cpp
@@ -105,7 +105,12 @@ QDateTime TextFactory::parseDateTime(const QString& date_time, QString* used_dt_
   // Iterate over patterns and check if input date/time matches the pattern.
   for (const QString& pattern : std::as_const(date_patterns)) {
     QString input_date_chopped = input_date.left(pattern.size());
+
+#if QT_VERSION >= 0x060700 // Qt >= 6.7.0
+    dt = locale.toDateTime(input_date_chopped, pattern, 2000);
+#else
     dt = locale.toDateTime(input_date_chopped, pattern);
+#endif
 
     if (dt.isValid()) {
       // Make sure that this date/time is considered UTC.