diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-08 23:18:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-08 23:18:04 +0000 |
| commit | 900c9a61dee1511c9f4086ea5a3a3632b944cc0e (patch) | |
| tree | 58208cc69b57a78a0cc90e81d73c3d8da55f3b7f /screen_ui.h | |
| parent | 64346eae51861356f8bf0f50e68dfeb9e1d04052 (diff) | |
| parent | aa0d6afb61f4cf928e87c7a21bcb59fc973f15a0 (diff) | |
| download | bootable_recovery-900c9a61dee1511c9f4086ea5a3a3632b944cc0e.zip bootable_recovery-900c9a61dee1511c9f4086ea5a3a3632b944cc0e.tar.gz bootable_recovery-900c9a61dee1511c9f4086ea5a3a3632b944cc0e.tar.bz2 | |
Merge "Remove the fixed screen size assumptions."
Diffstat (limited to 'screen_ui.h')
| -rw-r--r-- | screen_ui.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/screen_ui.h b/screen_ui.h index 01a33bf..210fd3e 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -84,17 +84,14 @@ class ScreenRecoveryUI : public RecoveryUI { // progress bar) bool pagesIdentical; - static const int kMaxCols = 96; - static const int kMaxRows = 96; - // Log text overlay, displayed when a magic key is pressed - char text[kMaxRows][kMaxCols]; - int text_cols, text_rows; - int text_col, text_row, text_top; + char** text; + size_t text_cols, text_rows; + size_t text_col, text_row, text_top; bool show_text; bool show_text_ever; // has show_text ever been true? - char menu[kMaxRows][kMaxCols]; + char** menu; bool show_menu; int menu_top, menu_items, menu_sel; @@ -102,8 +99,6 @@ class ScreenRecoveryUI : public RecoveryUI { int animation_fps; int installing_frames; - protected: - private: int iconX, iconY; |