Merge pull request #1212 from LedgerHQ/auto_update_API_LEVEL_24

[AUTO_UPDATE] Branch API_LEVEL_24

Author: nroggeman-ledger

lib_nbgl/src/nbgl_fonts.c

@@ -602,7 +602,8 @@ bool nbgl_getTextMaxLenInNbLines(nbgl_font_id_e fontId,
             if (maxNbLines == 0) {
                 text--;
             }
-            width = 0;
+            lastDelimiter = NULL;
+            width         = 0;
             continue;
         }
         // if \f, exit

lib_nbgl/src/nbgl_obj.c

@@ -1127,18 +1127,23 @@ static void draw_textArea(nbgl_text_area_t *obj, nbgl_obj_t *prevObj, bool compu
         }
         else {
 #ifdef HAVE_SE_TOUCH
-            uint16_t dotsWidth = nbgl_getSingleLineTextWidth(obj->fontId, "...");
             // for last chunk, if nbMaxLines is used, replace the 3 last chars by "..."
-            // draw line except 3 last chars
-            if ((lineWidth + dotsWidth) >= obj->obj.area.width) {
-                lineLen -= 3;
-            }
-            nbgl_drawText(&rectArea, text, lineLen, obj->fontId, obj->textColor);
-            rectArea.x0 += nbgl_getSingleLineTextWidthInLen(obj->fontId, text, lineLen);
+            // only if the line doesn't end with a '\n'
+            if (text[lineLen] != '\n') {
+                uint16_t dotsWidth = nbgl_getSingleLineTextWidth(obj->fontId, "...");
+                if ((lineWidth + dotsWidth) >= obj->obj.area.width) {
+                    lineLen -= 3;
+                }
+                nbgl_drawText(&rectArea, text, lineLen, obj->fontId, obj->textColor);
+                rectArea.x0 += nbgl_getSingleLineTextWidthInLen(obj->fontId, text, lineLen);
 
-            // draw "..." after the other chars
-            rectArea.width = dotsWidth;
-            nbgl_drawText(&rectArea, "...", 3, obj->fontId, obj->textColor);
+                // draw "..." after the other chars
+                rectArea.width = dotsWidth;
+                nbgl_drawText(&rectArea, "...", 3, obj->fontId, obj->textColor);
+            }
+            else {
+                nbgl_drawText(&rectArea, text, lineLen, obj->fontId, obj->textColor);
+            }
 #else   // HAVE_SE_TOUCH
             nbgl_drawText(&rectArea, text, lineLen, fontId, obj->textColor);
 #endif  // HAVE_SE_TOUCH

lib_nbgl/src/nbgl_use_case.c

@@ -1341,11 +1341,16 @@ static void displayDetailsPage(uint8_t detailsPage, bool forceFullRefresh)
                                     NB_MAX_LINES_IN_DETAILS,
                                     &len,
                                     detailsContext.wrapping);
-        len -= 3;
-        // memorize next position to save processing
-        detailsContext.nextPageStart = currentPair.value + len;
+        if (currentPair.value[len] != '\n') {
+            len -= 3;
+            // memorize next position to save processing
+            detailsContext.nextPageStart = currentPair.value + len;
+        }
+        else {
+            detailsContext.nextPageStart = currentPair.value + len + 1;
+        }
         // use special feature to keep only NB_MAX_LINES_IN_DETAILS lines and replace the last 3
-        // chars by "..."
+        // chars by "...", only if the next char to display in next page is not '\n'
         content.tagValueList.nbMaxLinesForValue = NB_MAX_LINES_IN_DETAILS;
     }
     else {