Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2277fb0284d50d378c2b0...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2277fb0284d50d378c2b0ca...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2277fb0284d50d378c2b0ca03...
The branch, master has been updated
via 2277fb0284d50d378c2b0ca03798bf1512769eea (commit)
from d3aac06e3f7a1fb68709013a987d696935d96d23 (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=2277fb0284d50d378c2...
commit 2277fb0284d50d378c2b0ca03798bf1512769eea
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Apply plot offsets to overlays.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index fed8a48..767f1c7 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -1654,8 +1654,8 @@ nserror treeview_expand(treeview *tree, bool only_folders)
/* Exported interface, documented in treeview.h */
-void treeview_redraw(treeview *tree, int x, int y, struct rect *clip,
- const struct redraw_context *ctx)
+void treeview_redraw(treeview *tree, const int x, const int y,
+ struct rect *clip, const struct redraw_context *ctx)
{
struct redraw_context new_ctx = *ctx;
treeview_node *node, *root, *next;
@@ -1740,7 +1740,7 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
node->type == TREE_NODE_ENTRY);
count++;
- inset = node->inset;
+ inset = x + node->inset;
height = (node->type == TREE_NODE_ENTRY) ? node->height :
tree_g.line_height;
@@ -1878,8 +1878,8 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
if (tree->move.target_pos != TV_TARGET_NONE &&
treeview_res[TREE_RES_ARROW].ready) {
/* Got a MOVE drag; render move indicator arrow */
- data.x = tree->move.target_area.x0;
- data.y = tree->move.target_area.y0;
+ data.x = tree->move.target_area.x0 + x;
+ data.y = tree->move.target_area.y0 + y;
data.background_colour = plot_style_even.bg.fill_colour;
content_redraw(treeview_res[TREE_RES_ARROW].c,
@@ -1888,7 +1888,7 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
} else if (tree->edit.textarea != NULL) {
/* Edit in progress; render textarea */
textarea_redraw(tree->edit.textarea,
- tree->edit.x, tree->edit.y,
+ tree->edit.x + x, tree->edit.y + y,
plot_style_even.bg.fill_colour, 1.0,
&r, &new_ctx);
}
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index fed8a48..767f1c7 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -1654,8 +1654,8 @@ nserror treeview_expand(treeview *tree, bool only_folders)
/* Exported interface, documented in treeview.h */
-void treeview_redraw(treeview *tree, int x, int y, struct rect *clip,
- const struct redraw_context *ctx)
+void treeview_redraw(treeview *tree, const int x, const int y,
+ struct rect *clip, const struct redraw_context *ctx)
{
struct redraw_context new_ctx = *ctx;
treeview_node *node, *root, *next;
@@ -1740,7 +1740,7 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
node->type == TREE_NODE_ENTRY);
count++;
- inset = node->inset;
+ inset = x + node->inset;
height = (node->type == TREE_NODE_ENTRY) ? node->height :
tree_g.line_height;
@@ -1878,8 +1878,8 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
if (tree->move.target_pos != TV_TARGET_NONE &&
treeview_res[TREE_RES_ARROW].ready) {
/* Got a MOVE drag; render move indicator arrow */
- data.x = tree->move.target_area.x0;
- data.y = tree->move.target_area.y0;
+ data.x = tree->move.target_area.x0 + x;
+ data.y = tree->move.target_area.y0 + y;
data.background_colour = plot_style_even.bg.fill_colour;
content_redraw(treeview_res[TREE_RES_ARROW].c,
@@ -1888,7 +1888,7 @@ void treeview_redraw(treeview *tree, int x, int y, struct rect
*clip,
} else if (tree->edit.textarea != NULL) {
/* Edit in progress; render textarea */
textarea_redraw(tree->edit.textarea,
- tree->edit.x, tree->edit.y,
+ tree->edit.x + x, tree->edit.y + y,
plot_style_even.bg.fill_colour, 1.0,
&r, &new_ctx);
}
--
NetSurf Browser