diff options
author | Damien Bargiacchi <drb@google.com> | 2016-08-24 22:45:14 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-24 22:45:14 +0200 |
commit | e3c71849116f5f503b9cc633c96caee8fda51d30 (patch) | |
tree | 2a05cf57d7178cf5598594ee0e96e8d7316d927f /wear_ui.cpp | |
parent | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp (diff) | |
parent | Support use of custom fonts in miniui (diff) | |
download | android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar.gz android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar.bz2 android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar.lz android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar.xz android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.tar.zst android_bootable_recovery-e3c71849116f5f503b9cc633c96caee8fda51d30.zip |
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r-- | wear_ui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index e078134ce..7ca879bcb 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -177,7 +177,7 @@ void WearRecoveryUI::draw_screen_locked() // items don't fit on the screen. if (menu_items > menu_end - menu_start) { sprintf(cur_selection_str, "Current item: %d/%d", menu_sel + 1, menu_items); - gr_text(x+4, y, cur_selection_str, 1); + gr_text(gr_sys_font(), x+4, y, cur_selection_str, 1); y += char_height_+4; } @@ -192,10 +192,10 @@ void WearRecoveryUI::draw_screen_locked() gr_fill(x, y-2, gr_fb_width()-x, y+char_height_+2); // white text of selected item SetColor(MENU_SEL_FG); - if (menu[i][0]) gr_text(x+4, y, menu[i], 1); + if (menu[i][0]) gr_text(gr_sys_font(), x+4, y, menu[i], 1); SetColor(MENU); - } else { - if (menu[i][0]) gr_text(x+4, y, menu[i], 0); + } else if (menu[i][0]) { + gr_text(gr_sys_font(), x+4, y, menu[i], 0); } y += char_height_+4; } @@ -216,7 +216,7 @@ void WearRecoveryUI::draw_screen_locked() for (int ty = gr_fb_height() - char_height_ - outer_height; ty > y+2 && count < text_rows; ty -= char_height_, ++count) { - gr_text(x+4, ty, text[row], 0); + gr_text(gr_sys_font(), x+4, ty, text[row], 0); --row; if (row < 0) row = text_rows-1; } @@ -285,7 +285,7 @@ void WearRecoveryUI::Init() { gr_init(); - gr_font_size(&char_width_, &char_height_); + gr_font_size(gr_sys_font(), &char_width_, &char_height_); text_col = text_row = 0; text_rows = (gr_fb_height()) / char_height_; |