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 /screen_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 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index ea5d047d9..4866873a1 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -259,7 +259,7 @@ void ScreenRecoveryUI::DrawHorizontalRule(int* y) { } void ScreenRecoveryUI::DrawTextLine(int x, int* y, const char* line, bool bold) { - gr_text(x, *y, line, bold); + gr_text(gr_sys_font(), x, *y, line, bold); *y += char_height_ + 4; } @@ -315,10 +315,10 @@ void ScreenRecoveryUI::draw_screen_locked() { gr_fill(0, y - 2, gr_fb_width(), y + char_height_ + 2); // Bold white text for the selected item. SetColor(MENU_SEL_FG); - gr_text(4, y, menu_[i], true); + gr_text(gr_sys_font(), 4, y, menu_[i], true); SetColor(MENU); } else { - gr_text(4, y, menu_[i], false); + gr_text(gr_sys_font(), 4, y, menu_[i], false); } y += char_height_ + 4; } @@ -334,7 +334,7 @@ void ScreenRecoveryUI::draw_screen_locked() { for (int ty = gr_fb_height() - char_height_; ty >= y && count < text_rows_; ty -= char_height_, ++count) { - gr_text(0, ty, text_[row], false); + gr_text(gr_sys_font(), 0, ty, text_[row], false); --row; if (row < 0) row = text_rows_ - 1; } @@ -457,7 +457,7 @@ void ScreenRecoveryUI::Init() { // Are we the large variant of our base layout? if (gr_fb_height() > PixelsFromDp(800)) ++layout_; - gr_font_size(&char_width_, &char_height_); + gr_font_size(gr_sys_font(), &char_width_, &char_height_); text_rows_ = gr_fb_height() / char_height_; text_cols_ = gr_fb_width() / char_width_; |