From 14942d7541732e5a77d2b834389b482ea99ccbde Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 2 Jan 2024 18:50:32 +0300
Subject: [PATCH] Shorten global map marker notes like vanilla (bug #7619)

---
 CHANGELOG.md                   |  1 +
 apps/openmw/mwgui/tooltips.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07f16ac81b..14f2d3d5ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@
     Bug #7604: Goblins Grunt becomes idle once injured
     Bug #7609: ForceGreeting should not open dialogue for werewolves
     Bug #7611: Beast races' idle animations slide after turning or jumping in place
+    Bug #7619: Long map notes may get cut off
     Bug #7630: Charm can be cast on creatures
     Bug #7631: Cannot trade with/talk to Creeper or Mudcrab Merchant when they're fleeing
     Bug #7636: Animations bug out when switching between 1st and 3rd person, while playing a scripted animation
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index bdc19a260d..9ee7d08f31 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -481,10 +481,13 @@ namespace MWGui
                 MyGUI::IntCoord(padding.left + 8 + 4, totalSize.height + padding.top, 300 - padding.left - 8 - 4,
                     300 - totalSize.height),
                 MyGUI::Align::Default);
-            edit->setEditMultiLine(true);
-            edit->setEditWordWrap(true);
-            edit->setCaption(note);
-            edit->setSize(edit->getWidth(), edit->getTextSize().height);
+            constexpr size_t maxLength = 60;
+            std::string shortenedNote = note.substr(0, std::min(maxLength, note.find('\n')));
+            if (shortenedNote.size() < note.size())
+                shortenedNote += " ...";
+            edit->setCaption(shortenedNote);
+            MyGUI::IntSize noteTextSize = edit->getTextSize();
+            edit->setSize(std::max(edit->getWidth(), noteTextSize.width), noteTextSize.height);
             icon->setPosition(icon->getLeft(), (edit->getTop() + edit->getBottom()) / 2 - icon->getHeight() / 2);
             totalSize.height += std::max(edit->getHeight(), icon->getHeight());
             totalSize.width = std::max(totalSize.width, edit->getWidth() + 8 + 4);