From 7d80ff120c74b7ce1de30f189cdd876a8cccbeae Mon Sep 17 00:00:00 2001
From: Christian Kaiser <info@ckaiser.com.ar>
Date: Tue, 20 Aug 2024 04:12:53 -0300
Subject: [PATCH] Fix news not parsing correctly

---
 src/app/ui/news_listbox.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/app/ui/news_listbox.cpp b/src/app/ui/news_listbox.cpp
index b4aa723a3..0e93b0be5 100644
--- a/src/app/ui/news_listbox.cpp
+++ b/src/app/ui/news_listbox.cpp
@@ -79,15 +79,15 @@ std::string parse_html(const std::string& str)
 
         std::string tag = str.substr(j, i - j);
         if (tag == "li") {
-          if (!paraOpen)
+          if (!paraOpen && result.back() != '\n')
             result.push_back('\n');
           result.push_back((char)0xc2);
           result.push_back((char)0xb7); // middle dot
           result.push_back(' ');
           paraOpen = false;
         }
-        else if (tag == "p" || tag == "ul") {
-          if (!paraOpen)
+        else if (tag == "p" || tag == "ul" || tag[0] == 'h') {
+          if (!paraOpen && result.back() != '\n')
             result.push_back('\n');
           paraOpen = true;
         }
@@ -123,7 +123,14 @@ std::string parse_html(const std::string& str)
       paraOpen = false;
     }
     else {
-      result.push_back(str[i++]);
+      auto character = str[i++];
+      if (character == '\n') {
+        // Rely only on paragraphs for newlines, otherwise we render them as just spaces because sometimes they show up in the middle of sentences.
+        result.push_back(' ');
+      }
+      else {
+        result.push_back(character);
+      }
       paraOpen = false;
     }
   }
@@ -150,8 +157,10 @@ protected:
     setTextQuiet(m_title);
     gfx::Size sz = theme->calcSizeHint(this, style);
 
-    if (!m_desc.empty())
-      sz.h *= 5;
+    if (!m_desc.empty()) {
+      // Title + number of total lines
+      sz.h *= 1 + std::count(m_desc.begin(), m_desc.end(), '\n');
+    }
 
     ev.setSizeHint(gfx::Size(0, sz.h));
   }