Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/955cf5f97b9a2d906a6052e0ad681f344afb9600
...commit
http://git.netsurf-browser.org/netsurf.git/commit/955cf5f97b9a2d906a6052e0ad681f344afb9600
...tree
http://git.netsurf-browser.org/netsurf.git/tree/955cf5f97b9a2d906a6052e0ad681f344afb9600
The branch, master has been updated
via 955cf5f97b9a2d906a6052e0ad681f344afb9600 (commit)
via 654840e8452696bcc23633ca857c3a1fa0155d1e (commit)
via 2943e9ae467050ce359cb40d45081d79e6128ac5 (commit)
via de12be4e9ce1640ed047345a5f22757470f7c77d (commit)
from e85e2f7cdf58e0df1faba9a4868113eba9890edd (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=955cf5f97b9a2d906a6052e0ad681f344afb9600
commit 955cf5f97b9a2d906a6052e0ad681f344afb9600
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
RISCOS: change invalidate to cope with unscaled rectangles
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index e41f609..53a7b58 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -4278,10 +4278,10 @@ ro_gui_window_invalidate_area(struct gui_window *g,
const struct rect *rect)
return NSERROR_OK;
}
- x0 = floorf(rect->x0 * 2 * g->scale);
- y0 = -ceilf(rect->y1 * 2 * g->scale);
- x1 = ceilf(rect->x1 * 2 * g->scale) + 1;
- y1 = -floorf(rect->y0 * 2 * g->scale) + 1;
+ x0 = floorf(rect->x0 * 2 );
+ y0 = -ceilf(rect->y1 * 2 );
+ x1 = ceilf(rect->x1 * 2 ) + 1;
+ y1 = -floorf(rect->y0 * 2 ) + 1;
use_buffer =
(g->option.buffer_everything || g->option.buffer_animations);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=654840e8452696bcc23633ca857c3a1fa0155d1e
commit 654840e8452696bcc23633ca857c3a1fa0155d1e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
AMIGA: Update to remove rectangle scaling from browser window invalidate
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index f90b91e..f5a7cad 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -4111,7 +4111,7 @@ static void ami_do_redraw_limits(struct gui_window *g,
struct browser_window *bw
}
ami_do_redraw_tiled(g->shared, busy, x0, y0,
- (x1 - x0) * g->scale, (y1 - y0) * g->scale, sx, sy, bbox, &ctx);
+ x1 - x0, y1 - y0, sx, sy, bbox, &ctx);
ami_gui_free_space_box(bbox);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2943e9ae467050ce359cb40d45081d79e6128ac5
commit 2943e9ae467050ce359cb40d45081d79e6128ac5
Author: Michael Drake <[email protected]>
Commit: Vincent Sanders <[email protected]>
GTK: Update for unscaled bw invalidate rectangle.
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 769d36f..0a2dac1 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -1011,7 +1011,6 @@ static nserror
nsgtk_window_invalidate_area(struct gui_window *g, const struct rect *rect)
{
int sx, sy;
- float scale;
if (rect == NULL) {
gtk_widget_queue_draw(GTK_WIDGET(g->layout));
@@ -1023,13 +1022,12 @@ nsgtk_window_invalidate_area(struct gui_window *g,
const struct rect *rect)
}
gui_window_get_scroll(g, &sx, &sy);
- scale = browser_window_get_scale(g->bw);
gtk_widget_queue_draw_area(GTK_WIDGET(g->layout),
- rect->x0 * scale - sx,
- rect->y0 * scale - sy,
- (rect->x1 - rect->x0) * scale,
- (rect->y1 - rect->y0) * scale);
+ rect->x0 - sx,
+ rect->y0 - sy,
+ rect->x1 - rect->x0,
+ rect->y1 - rect->y0);
return NSERROR_OK;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=de12be4e9ce1640ed047345a5f22757470f7c77d
commit de12be4e9ce1640ed047345a5f22757470f7c77d
Author: Michael Drake <[email protected]>
Commit: Vincent Sanders <[email protected]>
Browser window: Make invalidate gui callback use unsacled coordinates.
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 0c765ab..397c6f1 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -2760,14 +2760,11 @@ void browser_window_update_box(struct browser_window
*bw, struct rect *rect)
{
int pos_x;
int pos_y;
- struct browser_window *top;
+ struct browser_window *top = bw;
assert(bw);
- if (bw->window != NULL) {
- /* Front end window */
- guit->window->invalidate(bw->window, rect);
- } else {
+ if (bw->window == NULL) {
/* Core managed browser window */
browser_window_get_position(bw, true, &pos_x, &pos_y);
@@ -2777,9 +2774,14 @@ void browser_window_update_box(struct browser_window
*bw, struct rect *rect)
rect->y0 += pos_y / bw->scale;
rect->x1 += pos_x / bw->scale;
rect->y1 += pos_y / bw->scale;
-
- guit->window->invalidate(top->window, rect);
}
+
+ rect->x0 *= top->scale;
+ rect->y0 *= top->scale;
+ rect->x1 *= top->scale;
+ rect->y1 *= top->scale;
+
+ guit->window->invalidate(top->window, rect);
}
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 16 +++++++++-------
frontends/amiga/gui.c | 2 +-
frontends/gtk/window.c | 10 ++++------
frontends/riscos/window.c | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 0c765ab..397c6f1 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -2760,14 +2760,11 @@ void browser_window_update_box(struct browser_window
*bw, struct rect *rect)
{
int pos_x;
int pos_y;
- struct browser_window *top;
+ struct browser_window *top = bw;
assert(bw);
- if (bw->window != NULL) {
- /* Front end window */
- guit->window->invalidate(bw->window, rect);
- } else {
+ if (bw->window == NULL) {
/* Core managed browser window */
browser_window_get_position(bw, true, &pos_x, &pos_y);
@@ -2777,9 +2774,14 @@ void browser_window_update_box(struct browser_window
*bw, struct rect *rect)
rect->y0 += pos_y / bw->scale;
rect->x1 += pos_x / bw->scale;
rect->y1 += pos_y / bw->scale;
-
- guit->window->invalidate(top->window, rect);
}
+
+ rect->x0 *= top->scale;
+ rect->y0 *= top->scale;
+ rect->x1 *= top->scale;
+ rect->y1 *= top->scale;
+
+ guit->window->invalidate(top->window, rect);
}
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index f90b91e..f5a7cad 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -4111,7 +4111,7 @@ static void ami_do_redraw_limits(struct gui_window *g,
struct browser_window *bw
}
ami_do_redraw_tiled(g->shared, busy, x0, y0,
- (x1 - x0) * g->scale, (y1 - y0) * g->scale, sx, sy, bbox, &ctx);
+ x1 - x0, y1 - y0, sx, sy, bbox, &ctx);
ami_gui_free_space_box(bbox);
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 769d36f..0a2dac1 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -1011,7 +1011,6 @@ static nserror
nsgtk_window_invalidate_area(struct gui_window *g, const struct rect *rect)
{
int sx, sy;
- float scale;
if (rect == NULL) {
gtk_widget_queue_draw(GTK_WIDGET(g->layout));
@@ -1023,13 +1022,12 @@ nsgtk_window_invalidate_area(struct gui_window *g,
const struct rect *rect)
}
gui_window_get_scroll(g, &sx, &sy);
- scale = browser_window_get_scale(g->bw);
gtk_widget_queue_draw_area(GTK_WIDGET(g->layout),
- rect->x0 * scale - sx,
- rect->y0 * scale - sy,
- (rect->x1 - rect->x0) * scale,
- (rect->y1 - rect->y0) * scale);
+ rect->x0 - sx,
+ rect->y0 - sy,
+ rect->x1 - rect->x0,
+ rect->y1 - rect->y0);
return NSERROR_OK;
}
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index e41f609..53a7b58 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -4278,10 +4278,10 @@ ro_gui_window_invalidate_area(struct gui_window *g,
const struct rect *rect)
return NSERROR_OK;
}
- x0 = floorf(rect->x0 * 2 * g->scale);
- y0 = -ceilf(rect->y1 * 2 * g->scale);
- x1 = ceilf(rect->x1 * 2 * g->scale) + 1;
- y1 = -floorf(rect->y0 * 2 * g->scale) + 1;
+ x0 = floorf(rect->x0 * 2 );
+ y0 = -ceilf(rect->y1 * 2 );
+ x1 = ceilf(rect->x1 * 2 ) + 1;
+ y1 = -floorf(rect->y0 * 2 ) + 1;
use_buffer =
(g->option.buffer_everything || g->option.buffer_animations);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
