Merge pull request colobot#1651 from colobot/1649-the-message-instruc…

…tion-and-character-escaping Fixed accidental removal of tooltip when displaying text with message()
hexagonrecursion · May 12, 2024 · c56d240 · c56d240
2 parents 5cc97d0 + 906ac1e
commit c56d240
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/colobot-base/src/ui/controls/window.cpp b/colobot-base/src/ui/controls/window.cpp
@@ -160,9 +160,18 @@ CLabel* CWindow::CreateLabel(const glm::vec2& pos, const glm::vec2& dim, int ico
 
     auto p = name.find("\\");
     if (p == std::string::npos)
-        label->SetName(name);
+        label->SetName(name, false);
     else
-        label->SetName(name.substr(0, p));
+        label->SetName(name.substr(0, p), false);
+
+    return label;
+}
+
+CLabel* CWindow::CreateLabelRaw(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg, std::string name)
+{
+    CLabel* label = CreateControl<CLabel>(pos, dim, icon, eventMsg);
+
+    label->SetName(name, false);
 
     return label;
 }

diff --git a/colobot-base/src/ui/controls/window.h b/colobot-base/src/ui/controls/window.h
@@ -66,6 +66,7 @@ class CWindow : public CControl
     CGroup*     CreateGroup(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg);
     CImage*     CreateImage(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg);
     CLabel*     CreateLabel(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg, std::string name);
+    CLabel*     CreateLabelRaw(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg, std::string name);
     CEdit*      CreateEdit(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg);
     CEditValue* CreateEditValue(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg);
     CScroll*    CreateScroll(const glm::vec2& pos, const glm::vec2& dim, int icon, EventType eventMsg);

diff --git a/colobot-base/src/ui/displaytext.cpp b/colobot-base/src/ui/displaytext.cpp
@@ -229,7 +229,7 @@ void CDisplayText::DisplayText(const char *text, glm::vec3 goal, float height,
 
     ppos = pos;
     ppos.y -= hLine/2.0f;
-    label = pw->CreateLabel(ppos, dim, -1, EventType(EVENT_DT_LABEL0+nLine), text);
+    label = pw->CreateLabelRaw(ppos, dim, -1, EventType(EVENT_DT_LABEL0+nLine), text);
     if ( label != nullptr )
     {
         label->SetFontSize(FONTSIZE);
@@ -390,7 +390,7 @@ bool CDisplayText::ClearLastText()
 
         pb1->SetState(STATE_ENABLE, pb2->TestState(STATE_ENABLE));
         pg1->SetIcon(pg2->GetIcon());
-        pl1->SetName(pl2->GetName());
+        pl1->SetName(pl2->GetName(), false);
 
         m_textLines[i] = m_textLines[i+1];
     }