macOS|libdoomsday|UI: Monospace font clipped at the end

Carriage return characters were confusing the Qt font renderer. IssueID #2372
skyjake · Dec 18, 2019 · 4a65139 · 4a65139
1 parent b173c53
commit 4a65139
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp
@@ -357,7 +357,9 @@ DENG_GUI_PIMPL(PackageInfoDialog)
 
         if (meta.has("notes"))
         {
-            msg += "\n\n" + meta.gets("notes") + _E(r);
+            String notesText = meta.gets("notes");
+            notesText.remove('\r'); // maybe old MS-DOS text
+            msg += "\n\n" + notesText + _E(r);
         }
 
         if (!bundle)

diff --git a/doomsday/apps/libdoomsday/src/resource/databundle.cpp b/doomsday/apps/libdoomsday/src/resource/databundle.cpp
@@ -658,6 +658,7 @@ DENG2_PIMPL(DataBundle), public Lockable
                 if (!notes.isEmpty())
                 {
                     notes.replace(QRegExp("\\s+"), " "); // normalize whitespace
+                    notes.remove('\r'); // begone foul MS-DOS
                     meta.set(VAR_NOTES, notes);
                 }
             }