Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/e41900bddc8488ae29f7c... ...commit http://git.netsurf-browser.org/netsurf.git/commit/e41900bddc8488ae29f7c30... ...tree http://git.netsurf-browser.org/netsurf.git/tree/e41900bddc8488ae29f7c3021... The branch, master has been updated via e41900bddc8488ae29f7c302103cfea3eef8bbdc (commit) via b828f6de02393cc47139fa268a5e1f2c2085771e (commit) via 763825e5972f6ea7f986056f84a68cec451ba7cb (commit) from cfc75ac6f98ce614cb224ffa243daf68a166c907 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e41900bddc8488ae29f... commit e41900bddc8488ae29f7c302103cfea3eef8bbdc Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Implied table rows must increment the row group's row count too. diff --git a/render/box_normalise.c b/render/box_normalise.c index a19047c..ecea6ea 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.c @@ -650,6 +650,7 @@ bool box_normalise_table_row_group(struct box *row_group, row_group->last = row; row->parent = row_group; + group_row_count++; if (box_normalise_table_row(row, col_info, c) == false) return false; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b828f6de02393cc4713... commit b828f6de02393cc47139fa268a5e1f2c2085771e Merge: cfc75ac 763825e Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Merge remote-tracking branch 'achal/fix-line-height' commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=763825e5972f6ea7f98... commit 763825e5972f6ea7f986056f84a68cec451ba7cb Author: Achal-Aggarwal <theachalaggarwal(a)gmail.com&gt; Commit: Achal-Aggarwal <theachalaggarwal(a)gmail.com&gt; Fixes #2101, evaluation of text field and textarea line height. diff --git a/desktop/textarea.c b/desktop/textarea.c index bd35a5e..2ba0982 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -1895,9 +1895,9 @@ struct textarea *textarea_create(const textarea_flags flags, ret->show = &ret->text; } - ret->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.3), - FMUL(nscss_screen_dpi, INTTOFIX((setup->text.size))))), - FONT_SIZE_SCALE * F_72)); + ret->line_height = FIXTOINT(FMUL(FLTTOFIX(1.3), FDIV(FMUL( + nscss_screen_dpi, FDIV(INTTOFIX(setup->text.size), + INTTOFIX(FONT_SIZE_SCALE))), F_72))); ret->caret_pos.line = ret->caret_pos.byte_off = -1; ret->caret_x = 0; ----------------------------------------------------------------------- Summary of changes: desktop/textarea.c | 6 +++--- render/box_normalise.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop/textarea.c b/desktop/textarea.c index bd35a5e..2ba0982 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -1895,9 +1895,9 @@ struct textarea *textarea_create(const textarea_flags flags, ret->show = &ret->text; } - ret->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.3), - FMUL(nscss_screen_dpi, INTTOFIX((setup->text.size))))), - FONT_SIZE_SCALE * F_72)); + ret->line_height = FIXTOINT(FMUL(FLTTOFIX(1.3), FDIV(FMUL( + nscss_screen_dpi, FDIV(INTTOFIX(setup->text.size), + INTTOFIX(FONT_SIZE_SCALE))), F_72))); ret->caret_pos.line = ret->caret_pos.byte_off = -1; ret->caret_x = 0; diff --git a/render/box_normalise.c b/render/box_normalise.c index a19047c..ecea6ea 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.c @@ -650,6 +650,7 @@ bool box_normalise_table_row_group(struct box *row_group, row_group->last = row; row->parent = row_group; + group_row_count++; if (box_normalise_table_row(row, col_info, c) == false) return false; -- NetSurf Browser