commit 35fff61b1c0d736d090a1cd1bb4e99141cc88ad8
author Damien Bargiacchi <drb@google.com> Thu Aug 11 15:57:03 2016 -0700
committer Damien Bargiacchi <drb@google.com> Thu Aug 18 19:51:45 2016 -0700
tree fb8d33f614d8457939b1247671c7331e051fb059
parent e49c0d6406dcce19bdcf81d635b3449004f44c7e

Support use of custom fonts in miniui

Bug: 29547343
Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index 2a0769e..c2b5326 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -259,7 +259,7 @@
 }
 
 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 @@
                     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 @@
         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 @@
     // 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_;