diff options
author | Tianjie Xu <xunchang@google.com> | 2018-10-14 03:47:49 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-14 03:47:49 +0200 |
commit | 06b1a89d72520e77c153782b2b2cff05d0ff6ffa (patch) | |
tree | d5aeb8925431733bc9e5cd2a30febc5b04f1d691 /wear_ui.cpp | |
parent | Merge "Use a host java program to generate the background text" (diff) | |
parent | Implement the graphic menus (diff) | |
download | android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar.gz android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar.bz2 android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar.lz android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar.xz android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.tar.zst android_bootable_recovery-06b1a89d72520e77c153782b2b2cff05d0ff6ffa.zip |
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r-- | wear_ui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 3b057b761..8f3bc7bbe 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -73,7 +73,7 @@ void WearRecoveryUI::draw_screen_locked() { if (!show_text) { draw_foreground_locked(); } else { - SetColor(TEXT_FILL); + SetColor(UIElement::TEXT_FILL); gr_fill(0, 0, gr_fb_width(), gr_fb_height()); // clang-format off @@ -99,8 +99,9 @@ void WearRecoveryUI::StartMenu(const std::vector<std::string>& headers, const std::vector<std::string>& items, size_t initial_selection) { std::lock_guard<std::mutex> lg(updateMutex); if (text_rows_ > 0 && text_cols_ > 0) { - menu_ = std::make_unique<Menu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1, - text_cols_ - 1, headers, items, initial_selection); + menu_ = std::make_unique<TextMenu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1, + text_cols_ - 1, headers, items, initial_selection, + char_height_, *this); update_screen_locked(); } } |