mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-08 20:12:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Core local history: Make rendering behave like treeview.

Browse Source 
This fixes behaviour now that both treeviews and local history can
be rendered through core window.
This commit is contained in:
Michael Drake 2017-06-10 11:50:53 +01:00
parent 368b03bffb
commit 56daba5878
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
desktop/browser_history.c
View File

@ -294,8 +294,6 @@ browser_window_history__redraw_entry(struct history *history,
int actual_x; int actual_x;
struct history_entry *child; struct history_entry *child;
int tailsize = 5; int tailsize = 5;
int xoffset = x - clip->x0;
int yoffset = y - clip->y0;
plot_style_t *pstyle; plot_style_t *pstyle;
plot_font_style_t *pfstyle; plot_font_style_t *pfstyle;
@ -311,22 +309,12 @@ browser_window_history__redraw_entry(struct history *history,
pfstyle = &pfstyle_node; pfstyle = &pfstyle_node;
} }
/* setup clip area */
rect.x0 = clip->x0 + xoffset;
rect.y0 = clip->y0 + yoffset;
rect.x1 = clip->x1 + xoffset;
rect.y1 = clip->y1 + yoffset;
res = ctx->plot->clip(ctx, &rect);
if (res != NSERROR_OK) {
return false;
}
/* Only attempt to plot bitmap if it is present */ /* Only attempt to plot bitmap if it is present */
if (entry->bitmap != NULL) { if (entry->bitmap != NULL) {
res = ctx->plot->bitmap(ctx, res = ctx->plot->bitmap(ctx,
entry->bitmap, entry->bitmap,
entry->x + xoffset, entry->x + x,
entry->y + yoffset, entry->y + y,
WIDTH, HEIGHT, WIDTH, HEIGHT,
0xffffff, 0xffffff,
0); 0);
@ -335,10 +323,10 @@ browser_window_history__redraw_entry(struct history *history,
} }
} }
rect.x0 = entry->x - 1 + xoffset; rect.x0 = entry->x - 1 + x;
rect.y0 = entry->y - 1 + yoffset; rect.y0 = entry->y - 1 + y;
rect.x1 = entry->x + xoffset + WIDTH; rect.x1 = entry->x + x + WIDTH;
rect.y1 = entry->y + yoffset + HEIGHT; rect.y1 = entry->y + y + HEIGHT;
res = ctx->plot->rectangle(ctx, pstyle, &rect); res = ctx->plot->rectangle(ctx, pstyle, &rect);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
return false; return false;
@ -353,8 +341,8 @@ browser_window_history__redraw_entry(struct history *history,
res = ctx->plot->text(ctx, res = ctx->plot->text(ctx,
pfstyle, pfstyle,
entry->x + xoffset, entry->x + x,
entry->y + HEIGHT + 12 + yoffset, entry->y + HEIGHT + 12 + y,
entry->page.title, entry->page.title,
char_offset); char_offset);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
@ -363,28 +351,28 @@ browser_window_history__redraw_entry(struct history *history,
/* for each child node draw a line and recurse redraw into it */ /* for each child node draw a line and recurse redraw into it */
for (child = entry->forward; child; child = child->next) { for (child = entry->forward; child; child = child->next) {
rect.x0 = entry->x + WIDTH + xoffset; rect.x0 = entry->x + WIDTH + x;
rect.y0 = entry->y + HEIGHT / 2 + yoffset; rect.y0 = entry->y + HEIGHT / 2 + y;
rect.x1 = entry->x + WIDTH + tailsize + xoffset; rect.x1 = entry->x + WIDTH + tailsize + x;
rect.y1 = entry->y + HEIGHT / 2 + yoffset; rect.y1 = entry->y + HEIGHT / 2 + y;
res = ctx->plot->line(ctx, &pstyle_line, &rect); res = ctx->plot->line(ctx, &pstyle_line, &rect);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
return false; return false;
} }
rect.x0 = entry->x + WIDTH + tailsize + xoffset; rect.x0 = entry->x + WIDTH + tailsize + x;
rect.y0 = entry->y + HEIGHT / 2 + yoffset; rect.y0 = entry->y + HEIGHT / 2 + y;
rect.x1 = child->x - tailsize + xoffset; rect.x1 = child->x - tailsize + x;
rect.y1 = child->y + HEIGHT / 2 + yoffset; rect.y1 = child->y + HEIGHT / 2 + y;
res = ctx->plot->line(ctx, &pstyle_line, &rect); res = ctx->plot->line(ctx, &pstyle_line, &rect);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
return false; return false;
} }
rect.x0 = child->x - tailsize + xoffset; rect.x0 = child->x - tailsize + x;
rect.y0 = child->y + HEIGHT / 2 + yoffset; rect.y0 = child->y + HEIGHT / 2 + y;
rect.x1 = child->x + xoffset; rect.x1 = child->x + x;
rect.y1 = child->y + HEIGHT / 2 + yoffset; rect.y1 = child->y + HEIGHT / 2 + y;
res = ctx->plot->line(ctx, &pstyle_line, &rect); res = ctx->plot->line(ctx, &pstyle_line, &rect);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
return false; return false;
@ -477,6 +465,7 @@ nserror browser_window_history_create(struct browser_window *bw)
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
return res; return res;
} }
pstyle_bg.fill_colour = 0xf888ff;
pfstyle_node.background = pstyle_bg.fill_colour; pfstyle_node.background = pstyle_bg.fill_colour;
pfstyle_node_sel.background = pstyle_bg.fill_colour; pfstyle_node_sel.background = pstyle_bg.fill_colour;
@ -778,6 +767,12 @@ bool browser_window_history_redraw_rectangle(struct browser_window *bw,
const struct redraw_context *ctx) const struct redraw_context *ctx)
{ {
struct history *history; struct history *history;
struct rect r = {
.x0 = clip->x0 + x,
.y0 = clip->y0 + y,
.x1 = clip->x1 + x,
.y1 = clip->y1 + y,
};
assert(bw != NULL); assert(bw != NULL);
history = bw->history; history = bw->history;
@ -785,7 +780,8 @@ bool browser_window_history_redraw_rectangle(struct browser_window *bw,
if (!history->start) if (!history->start)
return true; return true;
ctx->plot->rectangle(ctx, &pstyle_bg, clip); ctx->plot->clip(ctx, &r);
ctx->plot->rectangle(ctx, &pstyle_bg, &r);
return browser_window_history__redraw_entry( return browser_window_history__redraw_entry(
history, history->start, history, history->start,