diff --git a/programs/src/wordprocessor/print_export.cpp b/programs/src/wordprocessor/print_export.cpp index 9dbe01a..f955bc1 100644 --- a/programs/src/wordprocessor/print_export.cpp +++ b/programs/src/wordprocessor/print_export.cpp @@ -210,9 +210,15 @@ static void wp_draw_print_list_marker(Canvas& c, WordProcessorState* wp, WrapLin if (para->list_type == PARA_LIST_BULLET) { int bullet_x = marker_x + wp_scale_layout_units(7, WP_PRINT_DPI); - int bullet_r = wp_scale_layout_units(3, WP_PRINT_DPI); - if (bullet_r < 2) bullet_r = 2; - fill_circle(c, bullet_x, py + wl->height / 2, bullet_r, colors::BLACK); + StyledRun* run = (wl->run_idx >= 0 && wl->run_idx < wp->run_count) ? &wp->runs[wl->run_idx] : nullptr; + int run_size = run ? run->size : WP_DEFAULT_SIZE; + int font_px = wp_print_font_pixels(run_size); + TrueTypeFont* font = run ? wp_get_font(run->font_id, 0) : g_ui_font; + if (!font) font = g_ui_font; + int th = text_height(font, font_px); + int top_y = py + (wl->height - th) / 2; + char bullet[2] = { '\x95', '\0' }; + draw_text(c, font, bullet_x, top_y, bullet, colors::BLACK, font_px); return; } diff --git a/programs/src/wordprocessor/render.cpp b/programs/src/wordprocessor/render.cpp index bf5affd..491e39d 100644 --- a/programs/src/wordprocessor/render.cpp +++ b/programs/src/wordprocessor/render.cpp @@ -164,9 +164,15 @@ static void wp_draw_list_marker(Canvas& c, WordProcessorState* wp, WrapLine* wl, if (para->list_type == PARA_LIST_BULLET) { int bullet_x = marker_x + wp_scale_layout_units(7, WP_SCREEN_DPI); - int bullet_r = wp_scale_layout_units(3, WP_SCREEN_DPI); - if (bullet_r < 2) bullet_r = 2; - fill_circle(c, bullet_x, py + wl->height / 2, bullet_r, colors::TEXT_COLOR); + StyledRun* run = (wl->run_idx >= 0 && wl->run_idx < wp->run_count) ? &wp->runs[wl->run_idx] : nullptr; + int run_size = run ? run->size : WP_DEFAULT_SIZE; + int bullet_size = wp_screen_font_pixels(run_size); + TrueTypeFont* font = run ? wp_get_font(run->font_id, 0) : g_ui_font; + if (!font) font = g_ui_font; + int th = text_height(font, bullet_size); + int top_y = py + (wl->height - th) / 2; + char bullet[2] = { '\x95', '\0' }; + draw_text(c, font, bullet_x, top_y, bullet, colors::TEXT_COLOR, bullet_size); return; }