commit a0c3b1392eaaa624a5bfcaeb3acf3984f1996fa3
author Tao Bao <tbao@google.com> Thu Aug 17 02:36:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 02:36:03 2017 +0000
tree 6b89f0e93cc165466f27edd0a008b16205d745c3
parent 1c568e3342624ef7af5ae5097d6e6c0c4c663da3
parent fbd7429ca31cd2af706cfd052ead0df8e979770c

Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37 am: 7f7d9b2f37
am: fbd7429ca3

Change-Id: I3533d4e2c9c242577e8cb05a3590649c3d2697de

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index e056512..a025501 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -344,7 +344,8 @@
     y += DrawTextLines(x, y, HasThreeButtons() ? REGULAR_HELP : LONG_PRESS_HELP);
 
     SetColor(HEADER);
-    y += DrawWrappedTextLines(x, y, menu_headers_);
+    // Ignore kMenuIndent, which is not taken into account by text_cols_.
+    y += DrawWrappedTextLines(kMarginWidth, y, menu_headers_);
 
     SetColor(MENU);
     y += DrawHorizontalRule(y) + 4;