From 8edf1fe86f228549615e34b6350eecbe15620d50 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 5 Sep 2011 09:47:52 +0000 Subject: Dig out more dead frames stuff. svn path=/trunk/netsurf/; revision=12722 --- riscos/window.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'riscos') diff --git a/riscos/window.c b/riscos/window.c index 57a5eb36e..7530fa0f0 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1630,9 +1630,7 @@ void ro_gui_window_open(wimp_open *open) if ((g->bw->scrolling == SCROLLING_AUTO) || (g->bw->scrolling == SCROLLING_YES)) { /* windows lose scrollbars when containing a frameset */ - no_hscroll = (g->bw->children && - (g->bw->browser_window_type != - BROWSER_WINDOW_NORMAL)); + no_hscroll = false; no_vscroll = g->bw->children; /* hscroll */ @@ -1642,14 +1640,7 @@ void ro_gui_window_open(wimp_open *open) fheight = height; if (state.flags & wimp_WINDOW_HSCROLL) fheight += size; - if ((!no_hscroll) && - ((fheight > size) || - (g->bw->browser_window_type == - BROWSER_WINDOW_NORMAL)) && - ((h && width < content_get_width(h) * - 2 * g->bw->scale) || - (g->bw->browser_window_type == - BROWSER_WINDOW_NORMAL))) { + if (!no_hscroll) { if (!(state.flags & wimp_WINDOW_HSCROLL)) { height -= size; state.visible.y0 += size; @@ -1678,13 +1669,7 @@ void ro_gui_window_open(wimp_open *open) fwidth = width; if (state.flags & wimp_WINDOW_VSCROLL) fwidth += size; - if ((!no_vscroll) && - ((fwidth > size) || - (g->bw->browser_window_type == - BROWSER_WINDOW_NORMAL)) && - ((h && height < content_get_height(h) * - 2 * g->bw->scale) || - (g->bw->scrolling == SCROLLING_YES))) { + if (!no_vscroll) { if (!(state.flags & wimp_WINDOW_VSCROLL)) { width -= size; state.visible.x1 -= size; -- cgit v1.2.3