diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 15:46:39 +0100 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 15:46:39 +0100 |
| commit | a40dca49e8493802d7064bd8e6aaab03436568ee (patch) | |
| tree | 5a036a8ddc33423d3564b046837ff42bd46d8f61 /desktop/textarea.c | |
| parent | 6cabd4cd628833afa32aeb7c614ef153b4a1c985 (diff) | |
| parent | 8a931f01b958ad5862433ece6024bbde0aa4ecb8 (diff) | |
| download | netsurf-a40dca49e8493802d7064bd8e6aaab03436568ee.tar.gz netsurf-a40dca49e8493802d7064bd8e6aaab03436568ee.tar.bz2 | |
Merge branch 'tlsa/plotter-polish'
Diffstat (limited to 'desktop/textarea.c')
| -rw-r--r-- | desktop/textarea.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/textarea.c b/desktop/textarea.c index 3fd4c9804..5bae27a5c 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -45,9 +45,9 @@ #define TA_ALLOC_STEP 512 static plot_style_t pstyle_stroke_caret = { - .stroke_type = PLOT_OP_TYPE_SOLID, - .stroke_colour = CARET_COLOR, - .stroke_width = 1, + .stroke_type = PLOT_OP_TYPE_SOLID, + .stroke_colour = CARET_COLOR, + .stroke_width = plot_style_int_to_fixed(1), }; struct line_info { @@ -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; |