- add uint16_t mui_canvas_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_t y, uint8_t max_width, const char *str);

MirakelDev · MirakelDev · commit 0174eebbdcd5 · 2024-01-24T08:08:33.000+01:00
diff --git a/fw/application/src/app/chameleon/view/chameleon_view.c b/fw/application/src/app/chameleon/view/chameleon_view.c
@@ -17,7 +17,7 @@ static void chameleon_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     mui_canvas_set_font(p_canvas, MUI_FONT_NORMAL);
 
-    uint8_t x = 0, y = 0;
+    uint8_t x = 0, y = 0, w = 0;
     mui_canvas_draw_box(p_canvas, 0, y, mui_canvas_get_width(p_canvas), 12);
     mui_canvas_set_draw_color(p_canvas, 0);
 
@@ -43,26 +43,17 @@ static void chameleon_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     mui_canvas_set_draw_color(p_canvas, 1);
 
-    mui_rect_t clip_win_prev;
-    mui_rect_t clip_win_cur;
-    mui_canvas_get_clip_window(p_canvas, &clip_win_prev);
     x = 8;
-    clip_win_cur.x = x;
-    clip_win_cur.y = 0;
-    clip_win_cur.w = mui_canvas_get_width(p_canvas) - x * 2;
-    clip_win_cur.h = mui_canvas_get_height(p_canvas);
-    mui_canvas_set_clip_window(p_canvas, &clip_win_cur);
+    y = 13 + (mui_canvas_get_height(p_canvas) - 16) / 2;
+    w = mui_canvas_get_width(p_canvas) - x * 2;
 
     tag_helper_get_nickname(buff, sizeof(buff));
 
-    y = 13 + (mui_canvas_get_height(p_canvas) - 16) / 2;
-    if (clip_win_cur.w > mui_canvas_get_utf8_width(p_canvas, buff)) {
-        x += (clip_win_cur.w - mui_canvas_get_utf8_width(p_canvas, buff)) / 2;
+    if (w > mui_canvas_get_utf8_width(p_canvas, buff)) {
+        x += (w - mui_canvas_get_utf8_width(p_canvas, buff)) / 2;
     }
-    mui_canvas_draw_utf8_clip(p_canvas, x, y, buff);
-
-    mui_canvas_set_clip_window(p_canvas, &clip_win_prev);
 
+    mui_canvas_draw_utf8_truncate(p_canvas, x, y, w, buff);
     mui_canvas_draw_utf8(p_canvas, 0, y, "<");
     mui_canvas_draw_utf8(p_canvas, mui_canvas_get_width(p_canvas) - 5, y, ">");
 
diff --git a/fw/application/src/i18n/de_DE.c b/fw/application/src/i18n/de_DE.c
@@ -7,6 +7,7 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_BACK] = "[Zurück]",
     [_L_ERR] = "Fehler",
     [_L_ERR_CODE] = "Fehlercode",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo-Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE-Dateiübertragung",
diff --git a/fw/application/src/i18n/en_US.c b/fw/application/src/i18n/en_US.c
@@ -7,6 +7,7 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_BACK] = "Back",
     [_L_ERR] = "Error",
     [_L_ERR_CODE] = "Error Code",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE File Transfer",
diff --git a/fw/application/src/i18n/es_ES.c b/fw/application/src/i18n/es_ES.c
@@ -7,6 +7,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_BACK] = "[Atrás]",
     [_L_ERR] = "Error",
     [_L_ERR_CODE] = "Código error",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulador de amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transferencia BLE",
diff --git a/fw/application/src/i18n/fr_FR.c b/fw/application/src/i18n/fr_FR.c
@@ -7,6 +7,7 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_BACK] = "Retour",
     [_L_ERR] = "Erreur",
     [_L_ERR_CODE] = "Code d'Erreur",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulateur Amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transfert de Fichiers BLE",
diff --git a/fw/application/src/i18n/hu_HU.c b/fw/application/src/i18n/hu_HU.c
@@ -7,6 +7,7 @@ const char * const lang_hu_HU[_L_COUNT] = {
     [_L_BACK] = "Vissza",
     [_L_ERR] = "Hiba",
     [_L_ERR_CODE] = "Hibakód",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo Emulátor",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE Fájltovábbítás",
diff --git a/fw/application/src/i18n/ja_JP.c b/fw/application/src/i18n/ja_JP.c
@@ -7,6 +7,7 @@ const char * const lang_ja_JP[_L_COUNT] = {
     [_L_BACK] = "戻る",
     [_L_ERR] = "エラー",
     [_L_ERR_CODE] = "エラーコード",
+    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiiboエミュレータ",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLEファイル転送",
diff --git a/fw/application/src/i18n/nl_NL.c b/fw/application/src/i18n/nl_NL.c
@@ -7,6 +7,7 @@ const char * const lang_nl_NL[_L_COUNT] = {
     [_L_BACK] = "Terug",
     [_L_ERR] = "Fout",
     [_L_ERR_CODE] = "Foutcode",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo-Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE Bestandsoverdracht",
diff --git a/fw/application/src/i18n/pt_BR.c b/fw/application/src/i18n/pt_BR.c
@@ -7,6 +7,7 @@ const char * const lang_pt_BR[_L_COUNT] = {
     [_L_BACK] = "Voltar",
     [_L_ERR] = "Erro",
     [_L_ERR_CODE] = "Código de Erro",
+    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulador de Amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transferência de Arquivos BLE",
diff --git a/fw/application/src/i18n/string_id.h b/fw/application/src/i18n/string_id.h
@@ -8,6 +8,7 @@ typedef enum {
     _L_BACK,
     _L_ERR,
     _L_ERR_CODE,
+    _L_ELLIPSIS,
     _L_APP_AMIIBO,
     _L_APP_AMIIBOLINK,
     _L_APP_BLE,
diff --git a/fw/application/src/i18n/zh_Hans.c b/fw/application/src/i18n/zh_Hans.c
@@ -7,6 +7,7 @@ const char * const lang_zh_Hans[_L_COUNT] = {
     [_L_BACK] = "返回",
     [_L_ERR] = "错误",
     [_L_ERR_CODE] = "错误码",
+    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiibo模拟器",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "蓝牙传输",
diff --git a/fw/application/src/i18n/zh_TW.c b/fw/application/src/i18n/zh_TW.c
@@ -7,6 +7,7 @@ const char * const lang_zh_TW[_L_COUNT] = {
     [_L_BACK] = "返回",
     [_L_ERR] = "錯誤",
     [_L_ERR_CODE] = "錯誤碼",
+    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiibo模擬器",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "藍牙傳送",
diff --git a/fw/application/src/mui/mui_canvas.c b/fw/application/src/mui/mui_canvas.c
@@ -59,6 +59,33 @@ uint8_t mui_canvas_draw_glyph(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint
     u8g2_DrawGlyph(p_canvas->fb, x, y, encoding);
 }
 
+uint16_t mui_canvas_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_t y, uint8_t max_width, const char *str) {
+    char *p = str;
+    char utf8[5];
+
+    if (max_width < mui_canvas_get_utf8_width(p_canvas, str)) {
+        while (*p != 0) {
+            uint8_t utf8_size = mui_canvas_get_utf8_bytes(p);
+            memcpy(utf8, p, utf8_size);
+            utf8[utf8_size] = '\0';
+            if (x >= 0 && x <= max_width - mui_canvas_get_utf8_width(p_canvas, getLangString(_L_ELLIPSIS))) {
+                uint8_t utf8_w = mui_canvas_draw_utf8(p_canvas, x, y, utf8);
+                x += utf8_w;
+            } else {
+                uint8_t utf8_w = mui_canvas_draw_utf8(p_canvas, x, y, getLangString(_L_ELLIPSIS));
+                x += utf8_w + 1;
+
+                break;
+            }
+            p += utf8_size;
+        }
+    } else {
+        x = mui_canvas_draw_utf8(p_canvas, x, y, str) + 1;
+    }
+
+    return x;
+}
+
 uint16_t mui_canvas_get_utf8_width(mui_canvas_t *p_canvas, const char *s) { return u8g2_GetUTF8Width(p_canvas->fb, s); }
 
 void mui_canvas_set_frame(mui_canvas_t *p_canvas, uint8_t offset_x, uint8_t offset_y, uint8_t width, uint8_t height) {
diff --git a/fw/application/src/mui/mui_canvas.h b/fw/application/src/mui/mui_canvas.h
@@ -2,6 +2,7 @@
 #define MUI_CANVAS_H
 
 #include "mui_common.h"
+#include "i18n/language.h"
 
 typedef struct {
     u8g2_t *fb;
@@ -23,10 +24,11 @@ void mui_canvas_clear(mui_canvas_t *p_canvas);
 
 uint8_t mui_canvas_get_utf8_bytes(const char *p);
 
-    void mui_canvas_set_font(mui_canvas_t *p_canvas, const uint8_t *font);
+void mui_canvas_set_font(mui_canvas_t *p_canvas, const uint8_t *font);
 uint8_t mui_canvas_draw_utf8(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, const char *str);
 int32_t mui_canvas_draw_utf8_clip(mui_canvas_t *p_canvas, int32_t x, int32_t y, const char *text);
 uint8_t mui_canvas_draw_glyph(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint16_t encoding);
+uint16_t mui_canvas_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_t y, uint8_t max_width, const char *str);
 uint16_t mui_canvas_get_utf8_width(mui_canvas_t *p_canvas, const char *s);
 
 void mui_canvas_set_frame(mui_canvas_t *p_canvas, uint8_t offset_x, uint8_t offset_y, uint8_t width, uint8_t height);
diff --git a/fw/data/i18n.csv b/fw/data/i18n.csv
@@ -6,6 +6,7 @@ _L_OFF_F,[OFF],[关],[關],[NO],[KI],[AUS],[DÉSACTIVÉ],[UIT],[DESLIGADO],[オ
 _L_BACK,Back,返回,返回,[Atrás],Vissza,[Zurück],Retour,Terug,Voltar,戻る
 _L_ERR,Error,错误,錯誤,Error,Hiba,Fehler,Erreur,Fout,Erro,エラー
 _L_ERR_CODE,Error Code,错误码,錯誤碼,Código error,Hibakód,Fehlercode,Code d'Erreur,Foutcode,Código de Erro,エラーコード
+_L_ELLIPSIS,...,..,..,...,...,...,...,...,...,..
 _L_APP_AMIIBO,Amiibo Emulator,Amiibo模拟器,Amiibo模擬器,Emulador de amiibo,Amiibo Emulátor,Amiibo-Emulator,Emulateur Amiibo,Amiibo-Emulator,Emulador de Amiibo,Amiiboエミュレータ
 _L_APP_AMIIBOLINK,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink
 _L_APP_BLE,BLE File Transfer,蓝牙传输,藍牙傳送,Transferencia BLE,BLE Fájltovábbítás,BLE-Dateiübertragung,Transfert de Fichiers BLE,BLE Bestandsoverdracht,Transferência de Arquivos BLE,BLEファイル転送
