aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res-hdpi/images/erasing_text.pngbin0 -> 20528 bytes
-rw-r--r--res-hdpi/images/error_text.pngbin0 -> 11684 bytes
-rw-r--r--res-hdpi/images/icon_error.png (renamed from res/images/icon_error.png)bin19306 -> 19306 bytes
-rw-r--r--res-hdpi/images/icon_installing.png (renamed from res/images/icon_installing.png)bin118562 -> 118562 bytes
-rw-r--r--res-hdpi/images/installing_text.pngbin0 -> 40946 bytes
-rw-r--r--res-hdpi/images/no_command_text.pngbin0 -> 25013 bytes
-rw-r--r--res-hdpi/images/progress_empty.pngbin0 -> 81 bytes
-rw-r--r--res-hdpi/images/progress_fill.pngbin0 -> 83 bytes
-rw-r--r--res-hdpi/images/stage_empty.png (renamed from res/images/stage_empty.png)bin322 -> 322 bytes
-rw-r--r--res-hdpi/images/stage_fill.png (renamed from res/images/stage_fill.png)bin258 -> 258 bytes
-rw-r--r--res-mdpi/images/erasing_text.pngbin0 -> 12208 bytes
-rw-r--r--res-mdpi/images/error_text.pngbin0 -> 7202 bytes
-rw-r--r--res-mdpi/images/icon_error.pngbin0 -> 19306 bytes
-rw-r--r--res-mdpi/images/icon_installing.pngbin0 -> 118562 bytes
-rw-r--r--res-mdpi/images/installing_text.pngbin0 -> 24575 bytes
-rw-r--r--res-mdpi/images/no_command_text.pngbin0 -> 14168 bytes
-rw-r--r--res-mdpi/images/progress_empty.pngbin0 -> 74 bytes
-rw-r--r--res-mdpi/images/progress_fill.pngbin0 -> 83 bytes
-rw-r--r--res-mdpi/images/stage_empty.pngbin0 -> 322 bytes
-rw-r--r--res-mdpi/images/stage_fill.pngbin0 -> 258 bytes
-rw-r--r--res-xhdpi/images/erasing_text.pngbin0 -> 29674 bytes
-rw-r--r--res-xhdpi/images/error_text.pngbin0 -> 16599 bytes
-rw-r--r--res-xhdpi/images/icon_error.pngbin0 -> 19306 bytes
-rw-r--r--res-xhdpi/images/icon_installing.pngbin0 -> 118562 bytes
-rw-r--r--res-xhdpi/images/installing_text.pngbin0 -> 63220 bytes
-rw-r--r--res-xhdpi/images/no_command_text.pngbin0 -> 37222 bytes
-rw-r--r--res-xhdpi/images/progress_empty.pngbin0 -> 84 bytes
-rw-r--r--res-xhdpi/images/progress_fill.pngbin0 -> 84 bytes
-rw-r--r--res-xhdpi/images/stage_empty.pngbin0 -> 322 bytes
-rw-r--r--res-xhdpi/images/stage_fill.pngbin0 -> 258 bytes
-rw-r--r--res-xxhdpi/images/erasing_text.pngbin0 -> 52598 bytes
-rw-r--r--res-xxhdpi/images/error_text.pngbin0 -> 27839 bytes
-rw-r--r--res-xxhdpi/images/icon_error.pngbin0 -> 19306 bytes
-rw-r--r--res-xxhdpi/images/icon_installing.pngbin0 -> 118562 bytes
-rw-r--r--res-xxhdpi/images/installing_text.pngbin0 -> 133331 bytes
-rw-r--r--res-xxhdpi/images/no_command_text.pngbin0 -> 63887 bytes
-rw-r--r--res-xxhdpi/images/progress_empty.pngbin0 -> 86 bytes
-rw-r--r--res-xxhdpi/images/progress_fill.pngbin0 -> 86 bytes
-rw-r--r--res-xxhdpi/images/stage_empty.pngbin0 -> 322 bytes
-rw-r--r--res-xxhdpi/images/stage_fill.pngbin0 -> 258 bytes
-rw-r--r--res-xxxhdpi/images/erasing_text.pngbin0 -> 85500 bytes
-rw-r--r--res-xxxhdpi/images/error_text.pngbin0 -> 40216 bytes
-rw-r--r--res-xxxhdpi/images/icon_error.pngbin0 -> 19306 bytes
-rw-r--r--res-xxxhdpi/images/icon_installing.pngbin0 -> 118562 bytes
-rw-r--r--res-xxxhdpi/images/installing_text.pngbin0 -> 184958 bytes
-rw-r--r--res-xxxhdpi/images/no_command_text.pngbin0 -> 109746 bytes
-rw-r--r--res-xxxhdpi/images/progress_empty.pngbin0 -> 90 bytes
-rw-r--r--res-xxxhdpi/images/progress_fill.pngbin0 -> 90 bytes
-rw-r--r--res-xxxhdpi/images/stage_empty.pngbin0 -> 322 bytes
-rw-r--r--res-xxxhdpi/images/stage_fill.pngbin0 -> 258 bytes
-rw-r--r--res/images/erasing_text.pngbin31491 -> 0 bytes
-rw-r--r--res/images/error_text.pngbin17504 -> 0 bytes
-rw-r--r--res/images/installing_text.pngbin66592 -> 0 bytes
-rw-r--r--res/images/no_command_text.pngbin40632 -> 0 bytes
-rw-r--r--res/images/progress_empty.pngbin118 -> 0 bytes
-rw-r--r--res/images/progress_fill.pngbin404 -> 0 bytes
-rw-r--r--screen_ui.cpp29
-rw-r--r--screen_ui.h3
58 files changed, 16 insertions, 16 deletions
diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png
new file mode 100644
index 00000000..774244c8
--- /dev/null
+++ b/res-hdpi/images/erasing_text.png
Binary files differ
diff --git a/res-hdpi/images/error_text.png b/res-hdpi/images/error_text.png
new file mode 100644
index 00000000..64a57ec4
--- /dev/null
+++ b/res-hdpi/images/error_text.png
Binary files differ
diff --git a/res/images/icon_error.png b/res-hdpi/images/icon_error.png
index cb3d1ab2..cb3d1ab2 100644
--- a/res/images/icon_error.png
+++ b/res-hdpi/images/icon_error.png
Binary files differ
diff --git a/res/images/icon_installing.png b/res-hdpi/images/icon_installing.png
index c2c02016..c2c02016 100644
--- a/res/images/icon_installing.png
+++ b/res-hdpi/images/icon_installing.png
Binary files differ
diff --git a/res-hdpi/images/installing_text.png b/res-hdpi/images/installing_text.png
new file mode 100644
index 00000000..33b54f1b
--- /dev/null
+++ b/res-hdpi/images/installing_text.png
Binary files differ
diff --git a/res-hdpi/images/no_command_text.png b/res-hdpi/images/no_command_text.png
new file mode 100644
index 00000000..9927ecb6
--- /dev/null
+++ b/res-hdpi/images/no_command_text.png
Binary files differ
diff --git a/res-hdpi/images/progress_empty.png b/res-hdpi/images/progress_empty.png
new file mode 100644
index 00000000..b29d9be0
--- /dev/null
+++ b/res-hdpi/images/progress_empty.png
Binary files differ
diff --git a/res-hdpi/images/progress_fill.png b/res-hdpi/images/progress_fill.png
new file mode 100644
index 00000000..4c5e66bb
--- /dev/null
+++ b/res-hdpi/images/progress_fill.png
Binary files differ
diff --git a/res/images/stage_empty.png b/res-hdpi/images/stage_empty.png
index 251ec196..251ec196 100644
--- a/res/images/stage_empty.png
+++ b/res-hdpi/images/stage_empty.png
Binary files differ
diff --git a/res/images/stage_fill.png b/res-hdpi/images/stage_fill.png
index 1ab79e86..1ab79e86 100644
--- a/res/images/stage_fill.png
+++ b/res-hdpi/images/stage_fill.png
Binary files differ
diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png
new file mode 100644
index 00000000..fd86c3f6
--- /dev/null
+++ b/res-mdpi/images/erasing_text.png
Binary files differ
diff --git a/res-mdpi/images/error_text.png b/res-mdpi/images/error_text.png
new file mode 100644
index 00000000..f1b44c9b
--- /dev/null
+++ b/res-mdpi/images/error_text.png
Binary files differ
diff --git a/res-mdpi/images/icon_error.png b/res-mdpi/images/icon_error.png
new file mode 100644
index 00000000..cb3d1ab2
--- /dev/null
+++ b/res-mdpi/images/icon_error.png
Binary files differ
diff --git a/res-mdpi/images/icon_installing.png b/res-mdpi/images/icon_installing.png
new file mode 100644
index 00000000..c2c02016
--- /dev/null
+++ b/res-mdpi/images/icon_installing.png
Binary files differ
diff --git a/res-mdpi/images/installing_text.png b/res-mdpi/images/installing_text.png
new file mode 100644
index 00000000..064b2a31
--- /dev/null
+++ b/res-mdpi/images/installing_text.png
Binary files differ
diff --git a/res-mdpi/images/no_command_text.png b/res-mdpi/images/no_command_text.png
new file mode 100644
index 00000000..1f29b895
--- /dev/null
+++ b/res-mdpi/images/no_command_text.png
Binary files differ
diff --git a/res-mdpi/images/progress_empty.png b/res-mdpi/images/progress_empty.png
new file mode 100644
index 00000000..0883e007
--- /dev/null
+++ b/res-mdpi/images/progress_empty.png
Binary files differ
diff --git a/res-mdpi/images/progress_fill.png b/res-mdpi/images/progress_fill.png
new file mode 100644
index 00000000..c223871b
--- /dev/null
+++ b/res-mdpi/images/progress_fill.png
Binary files differ
diff --git a/res-mdpi/images/stage_empty.png b/res-mdpi/images/stage_empty.png
new file mode 100644
index 00000000..251ec196
--- /dev/null
+++ b/res-mdpi/images/stage_empty.png
Binary files differ
diff --git a/res-mdpi/images/stage_fill.png b/res-mdpi/images/stage_fill.png
new file mode 100644
index 00000000..1ab79e86
--- /dev/null
+++ b/res-mdpi/images/stage_fill.png
Binary files differ
diff --git a/res-xhdpi/images/erasing_text.png b/res-xhdpi/images/erasing_text.png
new file mode 100644
index 00000000..f88e0e6a
--- /dev/null
+++ b/res-xhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xhdpi/images/error_text.png b/res-xhdpi/images/error_text.png
new file mode 100644
index 00000000..c3a4cc6f
--- /dev/null
+++ b/res-xhdpi/images/error_text.png
Binary files differ
diff --git a/res-xhdpi/images/icon_error.png b/res-xhdpi/images/icon_error.png
new file mode 100644
index 00000000..cb3d1ab2
--- /dev/null
+++ b/res-xhdpi/images/icon_error.png
Binary files differ
diff --git a/res-xhdpi/images/icon_installing.png b/res-xhdpi/images/icon_installing.png
new file mode 100644
index 00000000..c2c02016
--- /dev/null
+++ b/res-xhdpi/images/icon_installing.png
Binary files differ
diff --git a/res-xhdpi/images/installing_text.png b/res-xhdpi/images/installing_text.png
new file mode 100644
index 00000000..a4dacd0f
--- /dev/null
+++ b/res-xhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xhdpi/images/no_command_text.png b/res-xhdpi/images/no_command_text.png
new file mode 100644
index 00000000..eb34e94b
--- /dev/null
+++ b/res-xhdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xhdpi/images/progress_empty.png b/res-xhdpi/images/progress_empty.png
new file mode 100644
index 00000000..429797bf
--- /dev/null
+++ b/res-xhdpi/images/progress_empty.png
Binary files differ
diff --git a/res-xhdpi/images/progress_fill.png b/res-xhdpi/images/progress_fill.png
new file mode 100644
index 00000000..7af35aaf
--- /dev/null
+++ b/res-xhdpi/images/progress_fill.png
Binary files differ
diff --git a/res-xhdpi/images/stage_empty.png b/res-xhdpi/images/stage_empty.png
new file mode 100644
index 00000000..251ec196
--- /dev/null
+++ b/res-xhdpi/images/stage_empty.png
Binary files differ
diff --git a/res-xhdpi/images/stage_fill.png b/res-xhdpi/images/stage_fill.png
new file mode 100644
index 00000000..1ab79e86
--- /dev/null
+++ b/res-xhdpi/images/stage_fill.png
Binary files differ
diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png
new file mode 100644
index 00000000..c87fd52b
--- /dev/null
+++ b/res-xxhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png
new file mode 100644
index 00000000..486e951d
--- /dev/null
+++ b/res-xxhdpi/images/error_text.png
Binary files differ
diff --git a/res-xxhdpi/images/icon_error.png b/res-xxhdpi/images/icon_error.png
new file mode 100644
index 00000000..cb3d1ab2
--- /dev/null
+++ b/res-xxhdpi/images/icon_error.png
Binary files differ
diff --git a/res-xxhdpi/images/icon_installing.png b/res-xxhdpi/images/icon_installing.png
new file mode 100644
index 00000000..c2c02016
--- /dev/null
+++ b/res-xxhdpi/images/icon_installing.png
Binary files differ
diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png
new file mode 100644
index 00000000..ef6e8f3f
--- /dev/null
+++ b/res-xxhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png
new file mode 100644
index 00000000..cc98bb18
--- /dev/null
+++ b/res-xxhdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xxhdpi/images/progress_empty.png b/res-xxhdpi/images/progress_empty.png
new file mode 100644
index 00000000..57c82358
--- /dev/null
+++ b/res-xxhdpi/images/progress_empty.png
Binary files differ
diff --git a/res-xxhdpi/images/progress_fill.png b/res-xxhdpi/images/progress_fill.png
new file mode 100644
index 00000000..0f36f48c
--- /dev/null
+++ b/res-xxhdpi/images/progress_fill.png
Binary files differ
diff --git a/res-xxhdpi/images/stage_empty.png b/res-xxhdpi/images/stage_empty.png
new file mode 100644
index 00000000..251ec196
--- /dev/null
+++ b/res-xxhdpi/images/stage_empty.png
Binary files differ
diff --git a/res-xxhdpi/images/stage_fill.png b/res-xxhdpi/images/stage_fill.png
new file mode 100644
index 00000000..1ab79e86
--- /dev/null
+++ b/res-xxhdpi/images/stage_fill.png
Binary files differ
diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png
new file mode 100644
index 00000000..612e7a39
--- /dev/null
+++ b/res-xxxhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png
new file mode 100644
index 00000000..50d2fadb
--- /dev/null
+++ b/res-xxxhdpi/images/error_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/icon_error.png b/res-xxxhdpi/images/icon_error.png
new file mode 100644
index 00000000..cb3d1ab2
--- /dev/null
+++ b/res-xxxhdpi/images/icon_error.png
Binary files differ
diff --git a/res-xxxhdpi/images/icon_installing.png b/res-xxxhdpi/images/icon_installing.png
new file mode 100644
index 00000000..c2c02016
--- /dev/null
+++ b/res-xxxhdpi/images/icon_installing.png
Binary files differ
diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png
new file mode 100644
index 00000000..9bd093bf
--- /dev/null
+++ b/res-xxxhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png
new file mode 100644
index 00000000..6354e6a9
--- /dev/null
+++ b/res-xxxhdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/progress_empty.png b/res-xxxhdpi/images/progress_empty.png
new file mode 100644
index 00000000..ba25afb6
--- /dev/null
+++ b/res-xxxhdpi/images/progress_empty.png
Binary files differ
diff --git a/res-xxxhdpi/images/progress_fill.png b/res-xxxhdpi/images/progress_fill.png
new file mode 100644
index 00000000..83b72b27
--- /dev/null
+++ b/res-xxxhdpi/images/progress_fill.png
Binary files differ
diff --git a/res-xxxhdpi/images/stage_empty.png b/res-xxxhdpi/images/stage_empty.png
new file mode 100644
index 00000000..251ec196
--- /dev/null
+++ b/res-xxxhdpi/images/stage_empty.png
Binary files differ
diff --git a/res-xxxhdpi/images/stage_fill.png b/res-xxxhdpi/images/stage_fill.png
new file mode 100644
index 00000000..1ab79e86
--- /dev/null
+++ b/res-xxxhdpi/images/stage_fill.png
Binary files differ
diff --git a/res/images/erasing_text.png b/res/images/erasing_text.png
deleted file mode 100644
index 441768a0..00000000
--- a/res/images/erasing_text.png
+++ /dev/null
Binary files differ
diff --git a/res/images/error_text.png b/res/images/error_text.png
deleted file mode 100644
index 4ac6391f..00000000
--- a/res/images/error_text.png
+++ /dev/null
Binary files differ
diff --git a/res/images/installing_text.png b/res/images/installing_text.png
deleted file mode 100644
index e1ac819e..00000000
--- a/res/images/installing_text.png
+++ /dev/null
Binary files differ
diff --git a/res/images/no_command_text.png b/res/images/no_command_text.png
deleted file mode 100644
index a688f093..00000000
--- a/res/images/no_command_text.png
+++ /dev/null
Binary files differ
diff --git a/res/images/progress_empty.png b/res/images/progress_empty.png
deleted file mode 100644
index 72581832..00000000
--- a/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/res/images/progress_fill.png b/res/images/progress_fill.png
deleted file mode 100644
index becf87bd..00000000
--- a/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/screen_ui.cpp b/screen_ui.cpp
index af58643d..afe856c3 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -87,7 +87,7 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
87void ScreenRecoveryUI::draw_background_locked(Icon icon) 87void ScreenRecoveryUI::draw_background_locked(Icon icon)
88{ 88{
89 pagesIdentical = false; 89 pagesIdentical = false;
90 gr_color(0, 0, 0, 255); 90 gr_color(250, 250, 250, 255);
91 gr_clear(); 91 gr_clear();
92 92
93 if (icon) { 93 if (icon) {
@@ -123,7 +123,7 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon)
123 } 123 }
124 } 124 }
125 125
126 gr_color(255, 255, 255, 255); 126 gr_color(115, 115, 115, 255);
127 gr_texticon(textX, textY, text_surface); 127 gr_texticon(textX, textY, text_surface);
128 } 128 }
129} 129}
@@ -148,7 +148,7 @@ void ScreenRecoveryUI::draw_progress_locked()
148 int dy = (3*gr_fb_height() + iconHeight - 2*height)/4; 148 int dy = (3*gr_fb_height() + iconHeight - 2*height)/4;
149 149
150 // Erase behind the progress bar (in case this was a progress-only update) 150 // Erase behind the progress bar (in case this was a progress-only update)
151 gr_color(0, 0, 0, 255); 151 gr_color(250, 250, 250, 255);
152 gr_fill(dx, dy, width, height); 152 gr_fill(dx, dy, width, height);
153 153
154 if (progressBarType == DETERMINATE) { 154 if (progressBarType == DETERMINATE) {
@@ -179,20 +179,17 @@ void ScreenRecoveryUI::draw_progress_locked()
179void ScreenRecoveryUI::SetColor(UIElement e) { 179void ScreenRecoveryUI::SetColor(UIElement e) {
180 switch (e) { 180 switch (e) {
181 case HEADER: 181 case HEADER:
182 gr_color(247, 0, 6, 255); 182 gr_color(0xff, 0x57, 0x22, 255); // Quantum "Deep Orange" 500
183 break; 183 break;
184 case MENU: 184 case MENU:
185 case MENU_SEL_BG: 185 case MENU_SEL_BG:
186 gr_color(0, 106, 157, 255); 186 gr_color(0x67, 0x3a, 0xb7, 255); // Quantum "Deep Purple" 500
187 break; 187 break;
188 case MENU_SEL_FG: 188 case MENU_SEL_FG:
189 gr_color(255, 255, 255, 255); 189 gr_color(255, 255, 255, 255);
190 break; 190 break;
191 case LOG: 191 case LOG:
192 gr_color(249, 194, 0, 255); 192 gr_color(0x3f, 0x51, 0xb5, 255); // Quantum "Indigo" 500
193 break;
194 case TEXT_FILL:
195 gr_color(0, 0, 0, 160);
196 break; 193 break;
197 default: 194 default:
198 gr_color(255, 255, 255, 255); 195 gr_color(255, 255, 255, 255);
@@ -208,7 +205,7 @@ void ScreenRecoveryUI::draw_screen_locked()
208 draw_background_locked(currentIcon); 205 draw_background_locked(currentIcon);
209 draw_progress_locked(); 206 draw_progress_locked();
210 } else { 207 } else {
211 gr_color(0, 0, 0, 255); 208 gr_color(250, 250, 250, 255);
212 gr_clear(); 209 gr_clear();
213 210
214 int y = 0; 211 int y = 0;
@@ -222,13 +219,13 @@ void ScreenRecoveryUI::draw_screen_locked()
222 if (i == menu_top + menu_sel) { 219 if (i == menu_top + menu_sel) {
223 // draw the highlight bar 220 // draw the highlight bar
224 SetColor(MENU_SEL_BG); 221 SetColor(MENU_SEL_BG);
225 gr_fill(0, y-2, gr_fb_width(), y+char_height+2); 222 gr_fill(0, y-2+kTextYOffset, gr_fb_width(), y+char_height+2+kTextYOffset);
226 // white text of selected item 223 // white text of selected item
227 SetColor(MENU_SEL_FG); 224 SetColor(MENU_SEL_FG);
228 if (menu[i][0]) gr_text(4, y, menu[i], 1); 225 if (menu[i][0]) gr_text(kTextXOffset, y+kTextYOffset, menu[i], 1);
229 SetColor(MENU); 226 SetColor(MENU);
230 } else { 227 } else {
231 if (menu[i][0]) gr_text(4, y, menu[i], i < menu_top); 228 if (menu[i][0]) gr_text(kTextXOffset, y+kTextYOffset, menu[i], i < menu_top);
232 } 229 }
233 y += char_height+4; 230 y += char_height+4;
234 } 231 }
@@ -249,7 +246,7 @@ void ScreenRecoveryUI::draw_screen_locked()
249 for (int ty = gr_fb_height() - char_height, count = 0; 246 for (int ty = gr_fb_height() - char_height, count = 0;
250 ty > y+2 && count < text_rows; 247 ty > y+2 && count < text_rows;
251 ty -= char_height, ++count) { 248 ty -= char_height, ++count) {
252 gr_text(4, ty, text[row], 0); 249 gr_text(kTextXOffset, ty+kTextYOffset, text[row], 0);
253 --row; 250 --row;
254 if (row < 0) row = text_rows-1; 251 if (row < 0) row = text_rows-1;
255 } 252 }
@@ -350,11 +347,11 @@ void ScreenRecoveryUI::Init()
350 gr_font_size(&char_width, &char_height); 347 gr_font_size(&char_width, &char_height);
351 348
352 text_col = text_row = 0; 349 text_col = text_row = 0;
353 text_rows = gr_fb_height() / char_height; 350 text_rows = (gr_fb_height() - 2 * kTextYOffset) / char_height;
354 if (text_rows > kMaxRows) text_rows = kMaxRows; 351 if (text_rows > kMaxRows) text_rows = kMaxRows;
355 text_top = 1; 352 text_top = 1;
356 353
357 text_cols = gr_fb_width() / char_width; 354 text_cols = (gr_fb_width() - 2 * kTextXOffset) / char_width;
358 if (text_cols > kMaxCols - 1) text_cols = kMaxCols - 1; 355 if (text_cols > kMaxCols - 1) text_cols = kMaxCols - 1;
359 356
360 backgroundIcon[NONE] = NULL; 357 backgroundIcon[NONE] = NULL;
diff --git a/screen_ui.h b/screen_ui.h
index 92e4795b..2e01acda 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -87,6 +87,9 @@ class ScreenRecoveryUI : public RecoveryUI {
87 static const int kMaxCols = 96; 87 static const int kMaxCols = 96;
88 static const int kMaxRows = 96; 88 static const int kMaxRows = 96;
89 89
90 static const int kTextXOffset = 8;
91 static const int kTextYOffset = 4;
92
90 // Log text overlay, displayed when a magic key is pressed 93 // Log text overlay, displayed when a magic key is pressed
91 char text[kMaxRows][kMaxCols]; 94 char text[kMaxRows][kMaxCols];
92 int text_cols, text_rows; 95 int text_cols, text_rows;