mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 09:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use core browser window scrollbar type function instead of dereffing bw.

Browse Source
This commit is contained in:
Michael Drake 2014-10-25 12:04:51 +01:00
parent eed2a97eca
commit 2bf36893bc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
riscos/window.c
View File

@ -1491,6 +1491,8 @@ void ro_gui_window_open(wimp_open *open)
struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(open->w); struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(open->w);
int width = open->visible.x1 - open->visible.x0; int width = open->visible.x1 - open->visible.x0;
int height = open->visible.y1 - open->visible.y0; int height = open->visible.y1 - open->visible.y0;
browser_scrolling h_scroll;
browser_scrolling v_scroll;
int toolbar_height = 0; int toolbar_height = 0;
float new_scale = 0; float new_scale = 0;
wimp_window_state state; wimp_window_state state;
@ -1528,9 +1530,10 @@ void ro_gui_window_open(wimp_open *open)
state.yscroll = open->yscroll; state.yscroll = open->yscroll;
state.next = open->next; state.next = open->next;
browser_window_get_scrollbar_type(g->bw, &h_scroll, &v_scroll);
/* handle 'auto' scroll bars' and non-fitting scrollbar removal */ /* handle 'auto' scroll bars' and non-fitting scrollbar removal */
if ((g->bw->scrolling == SCROLLING_AUTO) || if ((h_scroll != BW_SCROLLING_NO) && (v_scroll != BW_SCROLLING_NO)) {
(g->bw->scrolling == SCROLLING_YES)) {
int size; int size;
/* windows lose scrollbars when containing a frameset */ /* windows lose scrollbars when containing a frameset */