summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Weidauer <sven@5sw.de>2018-04-02 10:50:58 +0200
committerSven Weidauer <sven@5sw.de>2018-04-02 10:50:58 +0200
commit4178bb262a94dd4dfd511c07ae5f69ac1c1adc70 (patch)
tree126a3f0c8b9e9fbc482887a0d8d9fedc526a332c
parent885c5ac91823b2f3d94e72028f603274d5cb3a42 (diff)
parentd884e0e53303c22e747c8d769189e21785b7f753 (diff)
downloadnetsurf-svenw/cocoa.tar.gz
netsurf-svenw/cocoa.tar.bz2
Merge remote-tracking branch 'origin/master' into svenw/cocoasvenw/cocoa
-rw-r--r--frontends/amiga/gui.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 8e822f3ac..e337ede0c 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -4967,22 +4967,20 @@ void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
if(gwin->objects[GID_HSCROLL])
{
GetAttr(SCROLLER_Top, (Object *)gwin->objects[GID_HSCROLL], xs);
+ *xs /= gwin->gw->scale;
} else {
*xs = 0;
}
-
- *xs /= gwin->gw->scale;
}
void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys)
{
if(gwin->objects[GID_VSCROLL]) {
GetAttr(SCROLLER_Top, gwin->objects[GID_VSCROLL], ys);
+ *ys /= gwin->gw->scale;
} else {
*ys = 0;
}
-
- *ys /= gwin->gw->scale;
}
static bool gui_window_get_scroll(struct gui_window *g, int *restrict sx, int *restrict sy)