diff options
| author | James Bursa <james@netsurf-browser.org> | 2004-04-02 15:52:28 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2004-04-02 15:52:28 +0000 |
| commit | c38ea1026a8d743d53681f22b75e965592718ca0 (patch) | |
| tree | 3dbfb7a3096038cd4bae8c938a3f2a852f202911 | |
| parent | 361fcf507a3591c97890091f1e906a2ee9402462 (diff) | |
| download | netsurf-c38ea1026a8d743d53681f22b75e965592718ca0.tar.gz netsurf-c38ea1026a8d743d53681f22b75e965592718ca0.tar.bz2 | |
[project @ 2004-04-02 15:52:28 by bursa]
Fix scrolling and resizing of scaled windows.
svn path=/import/netsurf/; revision=702
| -rw-r--r-- | riscos/window.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/riscos/window.c b/riscos/window.c index 1c7714b5e..df99589af 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -426,8 +426,8 @@ void ro_gui_window_open(gui_window *g, wimp_open *open) } /* the height should be no less than the content height */ - if (content && (unsigned int)height < content->height * 2) - height = content->height * 2; + if (content && (unsigned int)height < content->height * 2 * g->scale) + height = content->height * 2 * g->scale; /* change extent if necessary */ if (g->data.browser.old_width != width || @@ -439,8 +439,9 @@ void ro_gui_window_open(gui_window *g, wimp_open *open) g->data.browser.old_width = width; g->data.browser.old_height = height; - if (content && (unsigned int)width < content->width * 2) - width = content->width * 2; + if (content && (unsigned int)width < + content->width * 2 * g->scale) + width = content->width * 2 * g->scale; else { os_box extent = { 0, -height, width, toolbar_height }; wimp_set_extent(g->window, &extent); @@ -455,8 +456,9 @@ void ro_gui_window_open(gui_window *g, wimp_open *open) !(state.flags & wimp_WINDOW_FULL_SIZE)) { width = open->visible.x1 - open->visible.x0; height = open->visible.y1 - open->visible.y0 - toolbar_height; - if (content && (unsigned int)height < content->height * 2) - height = content->height * 2; + if (content && (unsigned int)height < + content->height * 2 * g->scale) + height = content->height * 2 * g->scale; { os_box extent = { 0, -height, width, toolbar_height }; wimp_set_extent(g->window, &extent); |