From 7d1108521680fbb14147a867e0ea15769119b78b Mon Sep 17 00:00:00 2001 From: kraus Date: Thu, 23 Dec 2021 16:38:33 +0100 Subject: [PATCH] issue #1732 --- csrc/u8g2_selection_list.c | 10 +++++----- tools/font/bdfconv/Makefile | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/csrc/u8g2_selection_list.c b/csrc/u8g2_selection_list.c index 5d5736c8..a74e2bd2 100644 --- a/csrc/u8g2_selection_list.c +++ b/csrc/u8g2_selection_list.c @@ -150,17 +150,17 @@ u8g2_uint_t u8g2_DrawUTF8Lines(u8g2_t *u8g2, u8g2_uint_t x, u8g2_uint_t y, u8g2_ static u8g2_uint_t u8g2_draw_selection_list_line(u8g2_t *u8g2, u8sl_t *u8sl, u8g2_uint_t y, uint8_t idx, const char *s) U8G2_NOINLINE; static u8g2_uint_t u8g2_draw_selection_list_line(u8g2_t *u8g2, u8sl_t *u8sl, u8g2_uint_t y, uint8_t idx, const char *s) { - u8g2_uint_t yy; + //u8g2_uint_t yy; uint8_t border_size = 0; uint8_t is_invert = 0; u8g2_uint_t line_height = u8g2_GetAscent(u8g2) - u8g2_GetDescent(u8g2)+MY_BORDER_SIZE; /* calculate offset from display upper border */ - yy = idx; - yy -= u8sl->first_pos; - yy *= line_height; - yy += y; + //yy = idx; + //yy -= u8sl->first_pos; + //yy *= line_height; + //yy += y; /* check whether this is the current cursor line */ if ( idx == u8sl->current_pos ) diff --git a/tools/font/bdfconv/Makefile b/tools/font/bdfconv/Makefile index 15b7a442..cbfdd8a4 100644 --- a/tools/font/bdfconv/Makefile +++ b/tools/font/bdfconv/Makefile @@ -294,6 +294,11 @@ wqy: bdfconv ncenR24: bdfconv ./bdfconv -v -f 1 -b 0 -m '32-701>32,7838' ../bdf/ncenR24.bdf -n u8g2_font_ncenR24_te -o test.c +ncenR10: bdfconv + ./bdfconv -v -f 1 -m '48-57,88,89' ../bdf/ncenR10.bdf -n u8g2_font_ncenR10 -o test.c -d ../bdf/helvB12.bdf + convert bdf.tga -trim ncenR10.png + + profont12v2: bdfconv #./bdfconv -v -f 1 -b 0 -m '32-701>32,7838' ../bdf/profont12v2.bdf -n u8g2_font_profont12v2_te -o test.c ./bdfconv -v -f 1 -b 0 -m '32-127' ../bdf/profont12v2.bdf -n u8g2_font_profont12v2_tr -o test.c