From e8a8087226628b53d001846a6672548af2bbeb24 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 15 Sep 2023 12:20:30 +0300 Subject: [PATCH 8/8] sdl2: Make size 11 fonts to adjust to theme font size See osdn #48574 Signed-off-by: Marko Lindqvist --- client/gui-sdl2/citydlg.c | 4 ++-- client/gui-sdl2/gui_string.c | 3 +++ client/gui-sdl2/gui_string.h | 1 + client/gui-sdl2/repodlgs.c | 16 ++++++++-------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/client/gui-sdl2/citydlg.c b/client/gui-sdl2/citydlg.c index 0b00e6daff..37c8cd5f57 100644 --- a/client/gui-sdl2/citydlg.c +++ b/client/gui-sdl2/citydlg.c @@ -1002,7 +1002,7 @@ static void create_city_options_widget_list(struct city *pcity) /* ----- */ fc_snprintf(cbuf, sizeof(cbuf), "%s:", _("New citizens produce")); - pstr = create_utf8_from_char(cbuf, adj_font(11)); + pstr = create_utf8_from_char_fonto(cbuf, FONTO_SLIGHTLY_BIGGER); pstr->style |= SF_CENTER; if (BV_ISSET(pcity->city_options, CITYO_SCIENCE_SPECIALISTS)) { @@ -1958,7 +1958,7 @@ static void redraw_info_city_dialog(struct widget *city_window, FREESURFACE(surf); - change_ptsize_utf8(pstr, adj_font(11)); + change_fonto_utf8(pstr, FONTO_SLIGHTLY_BIGGER); pstr->fgcol = *get_theme_color(COLOR_THEME_CITYDLG_INFOPANEL); if (pcity->pollution) { diff --git a/client/gui-sdl2/gui_string.c b/client/gui-sdl2/gui_string.c index 2bf76df6c6..83c3be80ec 100644 --- a/client/gui-sdl2/gui_string.c +++ b/client/gui-sdl2/gui_string.c @@ -166,6 +166,9 @@ static Uint16 fonto_ptsize(enum font_origin origin) case FONTO_DEFAULT: /* Rely on create_utf8_str() default */ return 0; + case FONTO_SLIGHTLY_BIGGER: + def = ptsize_default(); + return adj_font(MAX(def + 0, def * 1.1)); /* Same as def, when def < 10 */ case FONTO_ATTENTION: def = ptsize_default(); return adj_font(MAX(def + 1, def * 1.2)); diff --git a/client/gui-sdl2/gui_string.h b/client/gui-sdl2/gui_string.h index 43eb0e70fc..1ce4a0ecb6 100644 --- a/client/gui-sdl2/gui_string.h +++ b/client/gui-sdl2/gui_string.h @@ -62,6 +62,7 @@ typedef struct utf8_str { enum font_origin { FONTO_DEFAULT, + FONTO_SLIGHTLY_BIGGER, FONTO_ATTENTION, FONTO_HEADING, FONTO_BIG diff --git a/client/gui-sdl2/repodlgs.c b/client/gui-sdl2/repodlgs.c index b3ed70f87d..ad0a0abde1 100644 --- a/client/gui-sdl2/repodlgs.c +++ b/client/gui-sdl2/repodlgs.c @@ -2001,7 +2001,7 @@ void economy_report_dialog_popup(bool make_modal) w2 = adj_size(10) + buf->size.w; - /* lux rate slider */ + /* Lux rate slider */ buf = create_horizontal(current_theme->horiz, pwindow->dst, adj_size(30), (WF_FREE_DATA | WF_RESTORE_BACKGROUND)); @@ -2014,11 +2014,11 @@ void economy_report_dialog_popup(bool make_modal) w2 += adj_size(184); - /* lux rate iconlabel */ + /* Lux rate iconlabel */ - /* it is important to leave 1 space at ending of this string */ + /* It is important to leave 1 space at the end of this string. */ fc_snprintf(cbuf, sizeof(cbuf), "%d%% ", client.conn.playing->economic.luxury); - pstr = create_utf8_from_char(cbuf, adj_font(11)); + pstr = create_utf8_from_char_fonto(cbuf, FONTO_SLIGHTLY_BIGGER); pstr->style |= TTF_STYLE_BOLD; buf = create_iconlabel(icons->big_luxury, pwindow->dst, pstr, @@ -2048,7 +2048,7 @@ void economy_report_dialog_popup(bool make_modal) add_to_gui_list(ID_CHANGE_TAXRATE_DLG_SCI_BLOCK_CHECKBOX, buf); - /* science rate slider */ + /* Science rate slider */ buf = create_horizontal(current_theme->horiz, pwindow->dst, adj_size(30), (WF_FREE_DATA | WF_RESTORE_BACKGROUND)); @@ -2060,10 +2060,10 @@ void economy_report_dialog_popup(bool make_modal) add_to_gui_list(ID_CHANGE_TAXRATE_DLG_SCI_SCROLLBAR, buf); - /* science rate iconlabel */ - /* it is important to leave 1 space at ending of this string */ + /* Science rate iconlabel */ + /* It is important to leave 1 space at the end of this string */ fc_snprintf(cbuf, sizeof(cbuf), "%d%% ", client.conn.playing->economic.science); - pstr = create_utf8_from_char(cbuf, adj_font(11)); + pstr = create_utf8_from_char_fonto(cbuf, FONTO_SLIGHTLY_BIGGER); pstr->style |= TTF_STYLE_BOLD; buf = create_iconlabel(icons->big_colb, pwindow->dst, pstr, -- 2.40.1