diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/font_haru.c | 2 | ||||
| -rw-r--r-- | desktop/local_history.c | 4 | ||||
| -rw-r--r-- | desktop/plot_style.c | 4 | ||||
| -rw-r--r-- | desktop/textarea.c | 4 | ||||
| -rw-r--r-- | desktop/treeview.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/desktop/font_haru.c b/desktop/font_haru.c index f92d89197..4ee9824f0 100644 --- a/desktop/font_haru.c +++ b/desktop/font_haru.c @@ -352,7 +352,7 @@ bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, if (size <= 0) return true; - size /= FONT_SIZE_SCALE; + size /= PLOT_STYLE_SCALE; if (size > HPDF_MAX_FONTSIZE) size = HPDF_MAX_FONTSIZE; diff --git a/desktop/local_history.c b/desktop/local_history.c index 3219de90c..dc5bac99a 100644 --- a/desktop/local_history.c +++ b/desktop/local_history.c @@ -90,7 +90,7 @@ static plot_style_t pstyle_rect_sel = { */ static plot_font_style_t pfstyle_node = { .family = PLOT_FONT_FAMILY_SANS_SERIF, - .size = 8 * FONT_SIZE_SCALE, + .size = 8 * PLOT_STYLE_SCALE, .weight = 400, .flags = FONTF_NONE, }; @@ -101,7 +101,7 @@ static plot_font_style_t pfstyle_node = { */ static plot_font_style_t pfstyle_node_sel = { .family = PLOT_FONT_FAMILY_SANS_SERIF, - .size = 8 * FONT_SIZE_SCALE, + .size = 8 * PLOT_STYLE_SCALE, .weight = 900, .flags = FONTF_NONE, }; diff --git a/desktop/plot_style.c b/desktop/plot_style.c index 1f0ac39cf..c3a41398d 100644 --- a/desktop/plot_style.c +++ b/desktop/plot_style.c @@ -81,7 +81,7 @@ plot_style_t const * const plot_style_broken_object = static const plot_font_style_t plot_fstyle_broken_object_static = { .family = PLOT_FONT_FAMILY_SANS_SERIF, - .size = 16 * FONT_SIZE_SCALE, + .size = 16 * PLOT_STYLE_SCALE, .weight = 400, .flags = FONTF_NONE, .background = 0x8888ff, @@ -156,7 +156,7 @@ plot_style_t *plot_style_stroke_lightwbasec = &plot_style_stroke_lightwbasec_sta /* Generic font style */ static const plot_font_style_t plot_style_font_static = { .family = PLOT_FONT_FAMILY_SANS_SERIF, - .size = 8 * FONT_SIZE_SCALE, + .size = 8 * PLOT_STYLE_SCALE, .weight = 400, .flags = FONTF_NONE, .background = 0xffffff, diff --git a/desktop/textarea.c b/desktop/textarea.c index 3fd4c9804..5666c975b 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -1805,7 +1805,7 @@ static void textarea_setup_text_offsets(struct textarea *ta) ta->line_height = FIXTOINT(FMUL(FLTTOFIX(1.3), FDIV(FMUL( nscss_screen_dpi, FDIV(INTTOFIX(ta->fstyle.size), - INTTOFIX(FONT_SIZE_SCALE))), F_72))); + INTTOFIX(PLOT_STYLE_SCALE))), F_72))); text_y_offset = text_y_offset_baseline = ta->border_width; if (ta->flags & TEXTAREA_MULTILINE) { @@ -1948,7 +1948,7 @@ struct textarea *textarea_create(const textarea_flags flags, ret->line_height = FIXTOINT(FMUL(FLTTOFIX(1.3), FDIV(FMUL( nscss_screen_dpi, FDIV(INTTOFIX(setup->text.size), - INTTOFIX(FONT_SIZE_SCALE))), F_72))); + INTTOFIX(PLOT_STYLE_SCALE))), F_72))); ret->caret_pos.line = ret->caret_pos.byte_off = -1; ret->caret_x = 0; diff --git a/desktop/treeview.c b/desktop/treeview.c index 1651ff5ef..928a69666 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -5195,7 +5195,7 @@ nserror treeview_init(void) 10 + 36) / 72; tree_g.line_height = (font_px_size * 8 + 3) / 6; - res = treeview_init_plot_styles(font_pt_size * FONT_SIZE_SCALE / 10); + res = treeview_init_plot_styles(font_pt_size * PLOT_STYLE_SCALE / 10); if (res != NSERROR_OK) { return res; } |