Moved removeEscapeCharFromText() function from 'laf/base/string' to '…

…ui/intern'
Gasparoken · May 22, 2024 · 94909e8 · 94909e8
1 parent 4276729
commit 94909e8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/app/commands/cmd_tiled_mode.cpp b/src/app/commands/cmd_tiled_mode.cpp
@@ -17,6 +17,7 @@
 #include "app/pref/preferences.h"
 #include "filters/tiled_mode.h"
 #include "fmt/format.h"
+#include "ui/intern.h"
 
 namespace app {
 
@@ -79,7 +80,7 @@ std::string TiledModeCommand::onGetFriendlyName() const {
     case filters::TiledMode::X_AXIS: mode = Strings::main_menu_view_tiled_mode_x(); break;
     case filters::TiledMode::Y_AXIS: mode = Strings::main_menu_view_tiled_mode_y(); break;
   }
-  mode = base::removeEscapeCharFromText(mode, '&');
+  mode = ui::details::removeEscapeCharFromText(mode, '&');
   return fmt::format(getBaseFriendlyName(), mode);
 }
 

diff --git a/src/ui/intern.cpp b/src/ui/intern.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2024  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -9,6 +9,7 @@
 #include "config.h"
 #endif
 
+#include "base/utf8_decode.h"
 #include "ui/manager.h"
 #include "ui/system.h"
 #include "ui/theme.h"
@@ -76,5 +77,23 @@ void reinitThemeForAllWidgets()
   }
 }
 
+std::string removeEscapeCharFromText(const std::string& original,
+                                     const int escapeChar)
+{
+  std::wstring newText; // wstring is used to properly push_back() multibyte chars
+  newText.reserve(original.size());
+
+  base::utf8_decode decode(original);
+  while (int chr = decode.next()) {
+    if (chr == escapeChar) {
+      chr = decode.next();
+      if (!chr)
+        break;    // Ill-formed string (it ends with escape character)
+    }
+    newText.push_back(chr);
+  }
+  return base::to_utf8(newText);
+}
+
 } // namespace details
 } // namespace ui
diff --git a/src/ui/intern.h b/src/ui/intern.h
@@ -1,4 +1,5 @@
 // Aseprite UI Library
+// Copyright (C) 2024  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -34,6 +35,9 @@ namespace ui {
     void reinitThemeForAllWidgets();
     int old_guiscale();
 
+    std::string removeEscapeCharFromText(const std::string& original,
+                                         const int escapeChar);
+
   } // namespace details
 
 } // namespace ui