diff options
| author | Richard Wilson <rjw@netsurf-browser.org> | 2006-09-08 20:50:07 +0000 |
|---|---|---|
| committer | Richard Wilson <rjw@netsurf-browser.org> | 2006-09-08 20:50:07 +0000 |
| commit | 2f98e3977e999893461daf5266e4ebe2db5ba66b (patch) | |
| tree | bd2a8d76c1d691df0042b30d4d46ba8612484334 | |
| parent | c7f70a8cf6b1aa43354e96be70c19a19b394d539 (diff) | |
| download | netsurf-2f98e3977e999893461daf5266e4ebe2db5ba66b.tar.gz netsurf-2f98e3977e999893461daf5266e4ebe2db5ba66b.tar.bz2 | |
Take scrollbars into account when placing frames.
svn path=/trunk/netsurf/; revision=2936
| -rw-r--r-- | riscos/window.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/riscos/window.c b/riscos/window.c index efa121de9..32bd6945e 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -788,8 +788,8 @@ void gui_window_position_frame(struct gui_window *g, int x0, int y0, int x1, int } if (top->window->toolbar) toolbar_height = ro_gui_theme_toolbar_full_height(top->window->toolbar); - px0 = state.visible.x0; - py1 = state.visible.y1 - toolbar_height; + px0 = state.visible.x0 - state.xscroll; + py1 = state.visible.y1 - state.yscroll - toolbar_height; /* get our current window state */ state.w = g->window; @@ -892,12 +892,8 @@ void gui_window_update_extent(struct gui_window *g) g->old_height = -1; /* scroll on toolbar height change */ - if (g->toolbar) { - scroll = ro_gui_theme_height_change(g->toolbar); - state.yscroll -= scroll; - if (state.yscroll < 0) - state.yscroll = 0; - } + if (g->toolbar) + state.yscroll -= ro_gui_theme_height_change(g->toolbar); /* only allow a further reformat if we've gained/lost scrollbars */ flags = state.flags & (wimp_WINDOW_HSCROLL | wimp_WINDOW_VSCROLL); @@ -1749,7 +1745,7 @@ void ro_gui_window_open(wimp_open *open) ((fheight > size) || (g->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) && ((content && width < content->width * 2 * g->option.scale) || - (g->bw->scrolling == SCROLLING_YES))) { + (g->bw->browser_window_type == BROWSER_WINDOW_NORMAL))) { if (!(state.flags & wimp_WINDOW_HSCROLL)) { height -= size; state.visible.y0 += size; |