Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b16cfd2d6edf20a31613f...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b16cfd2d6edf20a31613f42...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b16cfd2d6edf20a31613f4215...
The branch, master has been updated
via b16cfd2d6edf20a31613f421582f528a93c40e41 (commit)
from 7738584b3411fa0941579831deae388139eb7a5a (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=b16cfd2d6edf20a3161...
commit b16cfd2d6edf20a31613f421582f528a93c40e41
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix #0002097, with thanks to Achal-Aggarwal for tracking this down.
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 584642d..bd35a5e 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1780,13 +1780,14 @@ static void textarea_setup_text_offsets(struct textarea *ta)
if (ta->flags & TEXTAREA_MULTILINE) {
/* Multiline textarea */
text_y_offset += ta->pad_top;
- text_y_offset_baseline += (ta->line_height * 3 + 2) / 4 +
- ta->pad_top;
+ text_y_offset_baseline +=
+ (ta->line_height * 3 + 2) / 4 + ta->pad_top;
} else {
/* Single line text area; text is vertically centered */
int vis_height = ta->vis_height - 2 * ta->border_width;
text_y_offset += (vis_height - ta->line_height + 1) / 2;
- text_y_offset_baseline += (vis_height * 3 + 2) / 4;
+ text_y_offset_baseline +=
+ (2 * vis_height + ta->line_height + 2) / 4;
}
ta->text_y_offset = text_y_offset;
-----------------------------------------------------------------------
Summary of changes:
desktop/textarea.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 584642d..bd35a5e 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1780,13 +1780,14 @@ static void textarea_setup_text_offsets(struct textarea *ta)
if (ta->flags & TEXTAREA_MULTILINE) {
/* Multiline textarea */
text_y_offset += ta->pad_top;
- text_y_offset_baseline += (ta->line_height * 3 + 2) / 4 +
- ta->pad_top;
+ text_y_offset_baseline +=
+ (ta->line_height * 3 + 2) / 4 + ta->pad_top;
} else {
/* Single line text area; text is vertically centered */
int vis_height = ta->vis_height - 2 * ta->border_width;
text_y_offset += (vis_height - ta->line_height + 1) / 2;
- text_y_offset_baseline += (vis_height * 3 + 2) / 4;
+ text_y_offset_baseline +=
+ (2 * vis_height + ta->line_height + 2) / 4;
}
ta->text_y_offset = text_y_offset;
--
NetSurf Browser