Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5f32f9ddd61ebd873ebb825c6e32d82e8965d840
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5f32f9ddd61ebd873ebb825c6e32d82e8965d840
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5f32f9ddd61ebd873ebb825c6e32d82e8965d840
The branch, master has been updated
via 5f32f9ddd61ebd873ebb825c6e32d82e8965d840 (commit)
via e7598fb0b5c83fddca34d9f1adeb3c0989ce9ae5 (commit)
from 7b7b1507d01b3e078790150d6b5f59ebaf0b45c3 (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=5f32f9ddd61ebd873ebb825c6e32d82e8965d840
commit 5f32f9ddd61ebd873ebb825c6e32d82e8965d840
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Revert "RISC OS: Squash unused variable."
This reverts commit 7aa1dd601e40d0684efbdd53b6ce5109846fcc37.
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 15c5f54..24ced69 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -532,6 +532,8 @@ static nserror ro_hotlist_init(void)
/* exported interface documented in riscos/hotlist.h */
nserror ro_gui_hotlist_present(void)
{
+ nserror res;
+
/* deal with external hotlist handler */
if (nsoption_bool(external_hotlists) &&
(nsoption_charp(external_hotlist_app) != NULL) &&
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e7598fb0b5c83fddca34d9f1adeb3c0989ce9ae5
commit e7598fb0b5c83fddca34d9f1adeb3c0989ce9ae5
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix unexpected opening of windows in riscos
closed windows were re-opened in RISC OS because corewindow updates
failed to take into account their current state when teh core updated
the content size.
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index fa42b8f..9896069 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -742,7 +742,7 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
LOG("content resize from w:%d h:%d to w:%d h:%d",
ro_cw->content_width, ro_cw->content_height, width, height);
- ro_cw->content_width = width;
+ ro_cw->content_width = width * 2;
ro_cw->content_height = -(2 * height);
state.w = ro_cw->wh;
@@ -753,13 +753,16 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
return;
}
- open.w = ro_cw->wh;
- open.visible = state.visible;
- open.xscroll = state.xscroll;
- open.yscroll = state.yscroll;
- open.next = state.next;
+ /* only update the window if it is open */
+ if (state.flags & wimp_WINDOW_OPEN) {
+ open.w = ro_cw->wh;
+ open.visible = state.visible;
+ open.xscroll = state.xscroll;
+ open.yscroll = state.yscroll;
+ open.next = state.next;
- update_scrollbars(ro_cw, &open);
+ update_scrollbars(ro_cw, &open);
+ }
}
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/corewindow.c | 17 ++++++++++-------
frontends/riscos/hotlist.c | 2 ++
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index fa42b8f..9896069 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -742,7 +742,7 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
LOG("content resize from w:%d h:%d to w:%d h:%d",
ro_cw->content_width, ro_cw->content_height, width, height);
- ro_cw->content_width = width;
+ ro_cw->content_width = width * 2;
ro_cw->content_height = -(2 * height);
state.w = ro_cw->wh;
@@ -753,13 +753,16 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
return;
}
- open.w = ro_cw->wh;
- open.visible = state.visible;
- open.xscroll = state.xscroll;
- open.yscroll = state.yscroll;
- open.next = state.next;
+ /* only update the window if it is open */
+ if (state.flags & wimp_WINDOW_OPEN) {
+ open.w = ro_cw->wh;
+ open.visible = state.visible;
+ open.xscroll = state.xscroll;
+ open.yscroll = state.yscroll;
+ open.next = state.next;
- update_scrollbars(ro_cw, &open);
+ update_scrollbars(ro_cw, &open);
+ }
}
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 15c5f54..24ced69 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -532,6 +532,8 @@ static nserror ro_hotlist_init(void)
/* exported interface documented in riscos/hotlist.h */
nserror ro_gui_hotlist_present(void)
{
+ nserror res;
+
/* deal with external hotlist handler */
if (nsoption_bool(external_hotlists) &&
(nsoption_charp(external_hotlist_app) != NULL) &&
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
