Project

General

Profile

Feature #212 ยป 0026-sdl2-3-Rename-FONTO_SLIGHTLY_BIGGER-as-FONTO_DEFAULT.patch

Marko Lindqvist, 01/31/2024 02:53 AM

View differences:

client/gui-sdl2/citydlg.c
/* ----- */
fc_snprintf(cbuf, sizeof(cbuf), "%s:", _("New citizens produce"));
pstr = create_utf8_from_char_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= SF_CENTER;
if (BV_ISSET(pcity->city_options, CITYO_SCIENCE_SPECIALISTS)) {
......
FREESURFACE(surf);
change_fonto_utf8(pstr, FONTO_SLIGHTLY_BIGGER);
change_fonto_utf8(pstr, FONTO_DEFAULT_PLUS);
pstr->fgcol = *get_theme_color(COLOR_THEME_CITYDLG_INFOPANEL);
if (pcity->pollution) {
client/gui-sdl2/gui_string.c
case FONTO_DEFAULT:
/* Rely on create_utf8_str() default */
return 0;
case FONTO_SLIGHTLY_BIGGER:
case FONTO_DEFAULT_PLUS:
def = ptsize_default();
return adj_font(MAX(def + 0, def * 1.1)); /* Same as def, when def < 10 */
case FONTO_ATTENTION:
client/gui-sdl2/gui_string.h
char *text;
} utf8_str;
/* .._PLUS might end up being same as its base size */
enum font_origin {
FONTO_DEFAULT,
FONTO_SLIGHTLY_BIGGER,
FONTO_DEFAULT_PLUS,
FONTO_ATTENTION,
FONTO_ATTENTION_PLUS,
FONTO_HEADING,
client/gui-sdl2/repodlgs.c
/* 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_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= TTF_STYLE_BOLD;
buf = create_iconlabel(icons->big_luxury, pwindow->dst, pstr,
......
/* 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_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= TTF_STYLE_BOLD;
buf = create_iconlabel(icons->big_colb, pwindow->dst, pstr,
client/gui-sdl3/citydlg.c
/* ----- */
fc_snprintf(cbuf, sizeof(cbuf), "%s:", _("New citizens produce"));
pstr = create_utf8_from_char_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= SF_CENTER;
if (BV_ISSET(pcity->city_options, CITYO_SCIENCE_SPECIALISTS)) {
......
FREESURFACE(surf);
change_fonto_utf8(pstr, FONTO_SLIGHTLY_BIGGER);
change_fonto_utf8(pstr, FONTO_DEFAULT_PLUS);
pstr->fgcol = *get_theme_color(COLOR_THEME_CITYDLG_INFOPANEL);
if (pcity->pollution) {
client/gui-sdl3/gui_string.c
case FONTO_DEFAULT:
/* Rely on create_utf8_str() default */
return 0;
case FONTO_SLIGHTLY_BIGGER:
case FONTO_DEFAULT_PLUS:
def = ptsize_default();
return adj_font(MAX(def + 0, def * 1.1)); /* Same as def, when def < 10 */
case FONTO_ATTENTION:
client/gui-sdl3/gui_string.h
char *text;
} utf8_str;
/* .._PLUS might end up being same as its base size */
enum font_origin {
FONTO_DEFAULT,
FONTO_SLIGHTLY_BIGGER,
FONTO_DEFAULT_PLUS,
FONTO_ATTENTION,
FONTO_ATTENTION_PLUS,
FONTO_HEADING,
client/gui-sdl3/repodlgs.c
/* 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_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= TTF_STYLE_BOLD;
buf = create_iconlabel(icons->big_luxury, pwindow->dst, pstr,
......
/* 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_fonto(cbuf, FONTO_SLIGHTLY_BIGGER);
pstr = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT_PLUS);
pstr->style |= TTF_STYLE_BOLD;
buf = create_iconlabel(icons->big_colb, pwindow->dst, pstr,
    (1-1/1)