From 12c1677697c324347d03ac491cd05526d127dd55 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Oct 2020 17:27:26 +0200 Subject: [PATCH] Small cleanup --- menu/drivers/ozone/ozone_display.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c index 54ec1c519c..0d87719b81 100644 --- a/menu/drivers/ozone/ozone_display.c +++ b/menu/drivers/ozone/ozone_display.c @@ -375,9 +375,9 @@ void ozone_draw_osk(ozone_handle_t *ozone, const char *label, const char *str) { unsigned i; - const char *text; char message[2048]; - unsigned text_color; + const char *text = str; + unsigned text_color = 0xffffffff; static float ozone_osk_backdrop[16] = { 0.00, 0.00, 0.00, 0.15, 0.00, 0.00, 0.00, 0.15, @@ -468,12 +468,7 @@ void ozone_draw_osk(ozone_handle_t *ozone, ozone_osk_backdrop); /* Placeholder & text*/ - if (!draw_placeholder) - { - text = str; - text_color = 0xffffffff; - } - else + if (draw_placeholder) { text = label; text_color = ozone_theme_light.text_sublabel_rgba; @@ -523,7 +518,8 @@ void ozone_draw_osk(ozone_handle_t *ozone, margin + padding + y_offset - + ozone->fonts.entries_label.line_height - ozone->fonts.entries_label.line_ascender + + ozone->fonts.entries_label.line_height + - ozone->fonts.entries_label.line_ascender + ozone->dimensions.spacer_3px, ozone->dimensions.spacer_1px, ozone->fonts.entries_label.line_ascender,