aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-04-08 14:42:50 -0500
committerElliott Hughes2015-04-08 18:16:52 -0500
commitaa0d6afb61f4cf928e87c7a21bcb59fc973f15a0 (patch)
treeeff03f3cbec4e503cb2bce4e9f71f92c425988b8 /screen_ui.h
parentca7bf53189c70ef0f687d54d772e5eaadc0b1c7c (diff)
downloadplatform-bootable-recovery-aa0d6afb61f4cf928e87c7a21bcb59fc973f15a0.tar.gz
platform-bootable-recovery-aa0d6afb61f4cf928e87c7a21bcb59fc973f15a0.tar.xz
platform-bootable-recovery-aa0d6afb61f4cf928e87c7a21bcb59fc973f15a0.zip
Remove the fixed screen size assumptions.
Dynamically allocate the text and menu arrays instead. Change-Id: Idbfc3fe4e4b50db4fee62ac2b6a7323cad369749
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/screen_ui.h b/screen_ui.h
index 01a33bfe..210fd3e1 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -84,17 +84,14 @@ class ScreenRecoveryUI : public RecoveryUI {
84 // progress bar) 84 // progress bar)
85 bool pagesIdentical; 85 bool pagesIdentical;
86 86
87 static const int kMaxCols = 96;
88 static const int kMaxRows = 96;
89
90 // Log text overlay, displayed when a magic key is pressed 87 // Log text overlay, displayed when a magic key is pressed
91 char text[kMaxRows][kMaxCols]; 88 char** text;
92 int text_cols, text_rows; 89 size_t text_cols, text_rows;
93 int text_col, text_row, text_top; 90 size_t text_col, text_row, text_top;
94 bool show_text; 91 bool show_text;
95 bool show_text_ever; // has show_text ever been true? 92 bool show_text_ever; // has show_text ever been true?
96 93
97 char menu[kMaxRows][kMaxCols]; 94 char** menu;
98 bool show_menu; 95 bool show_menu;
99 int menu_top, menu_items, menu_sel; 96 int menu_top, menu_items, menu_sel;
100 97
@@ -102,8 +99,6 @@ class ScreenRecoveryUI : public RecoveryUI {
102 99
103 int animation_fps; 100 int animation_fps;
104 int installing_frames; 101 int installing_frames;
105 protected:
106 private:
107 102
108 int iconX, iconY; 103 int iconX, iconY;
109 104