tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_.

Browse source 
We've deprecated kMaxCols/kMaxRows in ScreenRecoveryUI since commit
aa0d6afb61. They unnecessarily limit the
screen size to 96x96 characters.

Also remove the recomputations of text_cols, visible_text_rows (which is
the same as text_rows_). Remove the unintentional hiding of menu_headers_.

Test: mmma bootable/recovery
Change-Id: I7d1526b651943312d62d52cd200414b42bf9b12a
This commit is contained in:
Tao Bao 2017-08-26 08:32:29 -07:00
parent 571855b0e6
commit 1e27d14eea
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wear_ui.cpp
View file

@ -191,20 +191,6 @@ void WearRecoveryUI::update_progress_locked() {
gr_flip(); gr_flip();
} }
bool WearRecoveryUI::InitTextParams() {
if (!ScreenRecoveryUI::InitTextParams()) {
return false;
}
text_cols_ = (gr_fb_width() - (kMarginWidth * 2)) / char_width_;
if (text_rows_ > kMaxRows) text_rows_ = kMaxRows;
if (text_cols_ > kMaxCols) text_cols_ = kMaxCols;
visible_text_rows = (gr_fb_height() - (kMarginHeight * 2)) / char_height_;
return true;
}
bool WearRecoveryUI::Init(const std::string& locale) { bool WearRecoveryUI::Init(const std::string& locale) {
if (!ScreenRecoveryUI::Init(locale)) { if (!ScreenRecoveryUI::Init(locale)) {
return false; return false;
@ -269,7 +255,7 @@ void WearRecoveryUI::StartMenu(const char* const* headers, const char* const* it
show_menu = true; show_menu = true;
menu_sel = initial_selection; menu_sel = initial_selection;
menu_start = 0; menu_start = 0;
menu_end = visible_text_rows - 1 - kMenuUnusableRows; menu_end = text_rows_ - 1 - kMenuUnusableRows;
if (menu_items <= menu_end) menu_end = menu_items; if (menu_items <= menu_end) menu_end = menu_items;
update_screen_locked(); update_screen_locked();
} }

9
wear_ui.h
View file

@ -50,8 +50,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
int GetProgressBaseline() const override; int GetProgressBaseline() const override;
bool InitTextParams() override;
void update_progress_locked() override; void update_progress_locked() override;
void PrintV(const char*, bool, va_list) override; void PrintV(const char*, bool, va_list) override;
@ -59,13 +57,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
private: private:
GRSurface* backgroundIcon[5]; GRSurface* backgroundIcon[5];
static const int kMaxCols = 96;
static const int kMaxRows = 96;
// Number of text rows seen on screen
int visible_text_rows;
const char* const* menu_headers_;
int menu_start, menu_end; int menu_start, menu_end;
pthread_t progress_t; pthread_t progress_t;