Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5545782a6c23b0df532567499671ceb5c035ebc0
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5545782a6c23b0df532567499671ceb5c035ebc0
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5545782a6c23b0df532567499671ceb5c035ebc0
The branch, tlsa/cleanup-scale has been created
at 5545782a6c23b0df532567499671ceb5c035ebc0 (commit)
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5545782a6c23b0df532567499671ceb5c035ebc0
commit 5545782a6c23b0df532567499671ceb5c035ebc0
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[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=0761675f0e05fc2bb5f518b738e5ae41c53c9b07
commit 0761675f0e05fc2bb5f518b738e5ae41c53c9b07
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[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);
}
-----------------------------------------------------------------------
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org