diff options
| author | Steve Fryatt <steve@stevefryatt.org.uk> | 2011-02-20 23:16:33 +0000 |
|---|---|---|
| committer | Steve Fryatt <steve@stevefryatt.org.uk> | 2011-02-20 23:16:33 +0000 |
| commit | cd9c0998e9849472473e577c4c04906e380896e1 (patch) | |
| tree | 9bef19ebd3d56eccd03fa5613f1506c82762584b /riscos/plugin.c | |
| parent | f54fc080c2a96ffdb713a9c8b5d0ccb604197c07 (diff) | |
| download | netsurf-cd9c0998e9849472473e577c4c04906e380896e1.tar.gz netsurf-cd9c0998e9849472473e577c4c04906e380896e1.tar.bz2 | |
Merge branches/stevef/toolbars to trunk.
svn path=/trunk/netsurf/; revision=11741
Diffstat (limited to 'riscos/plugin.c')
| -rw-r--r-- | riscos/plugin.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/riscos/plugin.c b/riscos/plugin.c index 340eaaf3e..19fd2b806 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -63,7 +63,7 @@ #include "riscos/gui.h" #include "riscos/options.h" #include "riscos/plugin.h" -#include "riscos/theme.h" +#include "riscos/toolbar.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" @@ -362,8 +362,7 @@ void plugin_open(struct content *c, struct browser_window *bw, pmo.bbox.x0 = 10; /* avoid toolbar */ - pmo.bbox.y1 = -10 - (bw->window->toolbar ? - bw->window->toolbar->height : 0); + pmo.bbox.y1 = -10 - ro_toolbar_height(bw->window->toolbar); pmo.bbox.x1 = (state.visible.x1 - state.visible.x0) - 10; pmo.bbox.y0 = (state.visible.y0 - state.visible.y1) - 10; } @@ -501,8 +500,8 @@ void plugin_reformat(struct content *c, int width, int height) /* standalone */ x = 10 / 2; /* avoid toolbar */ - y = (10 + (c->data.plugin.bw->window->toolbar ? - c->data.plugin.bw->window->toolbar->height : 0)) / 2; + y = (10 + ro_toolbar_height( + c->data.plugin.bw->window->toolbar0)) / 2; } pmr.size = 52; |