From 756ec88512e0d3ed0c15a5d44e4d8d0fe500885f Mon Sep 17 00:00:00 2001 From: Michael W Date: Tue, 16 Aug 2016 13:06:45 +0200 Subject: [PATCH] cm: charger: Center capacity and vertical offset * What the title says :). Looks way better * Use half a vertical font size as offset Change-Id: I3e5cc039932a1016d419c4dbe5af5f7673631733 --- charger/healthd_board_cm.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/charger/healthd_board_cm.cpp b/charger/healthd_board_cm.cpp index 10dfddfc..f5e0ed1e 100644 --- a/charger/healthd_board_cm.cpp +++ b/charger/healthd_board_cm.cpp @@ -79,16 +79,19 @@ static int draw_surface_centered(GRSurface* surface) #define STR_LEN 64 static void draw_capacity(int capacity) { - struct frame *f = &anim.frames[0]; - int w = gr_get_width(f->surface); - int h = gr_get_height(f->surface); - int x = (gr_fb_width() - w) / 2 ; - int y = (gr_fb_height() + h) / 2; - char cap_str[STR_LEN]; snprintf(cap_str, (STR_LEN - 1), "%d%%", capacity); + + struct frame *f = &anim.frames[0]; + int font_x, font_y; + gr_font_size(&font_x, &font_y); + int w = gr_measure(cap_str); + int h = gr_get_height(f->surface); + int x = (gr_fb_width() - w) / 2; + int y = (gr_fb_height() + h) / 2; + gr_color(255, 255, 255, 255); - gr_text(x, y * 1.05, cap_str, 0); + gr_text(x, y + font_y / 2, cap_str, 0); } #ifdef QCOM_HARDWARE