mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 09:13:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Take scrollbars into account when placing frames.

Browse Source 
svn path=/trunk/netsurf/; revision=2936
This commit is contained in:
Richard Wilson 2006-09-08 20:50:07 +00:00
parent c7f70a8cf6
commit 2f98e3977e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
riscos/window.c
View File

@ -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;