diff options
| author | Ole Loots <ole@monochrom.net> | 2012-11-12 21:27:53 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2012-11-12 21:27:53 +0100 |
| commit | 082c76d9c3d381f233902bbb656b40f5b6670b7f (patch) | |
| tree | 68823478ec7563a103d493f9040e9b6dc6aadb60 /amiga | |
| parent | 44808e1c52b217cced501b946059324e55848dfa (diff) | |
| parent | 6641b082f8b003dbc887003776c060f3d53c95c7 (diff) | |
| download | netsurf-082c76d9c3d381f233902bbb656b40f5b6670b7f.tar.gz netsurf-082c76d9c3d381f233902bbb656b40f5b6670b7f.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/gui.c | 30 | ||||
| -rwxr-xr-x | amiga/gui_options.c | 20 |
2 files changed, 25 insertions, 25 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 37f054776..293379283 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1365,24 +1365,24 @@ void ami_handle_msg(void) width=bbox->Width; height=bbox->Height; - if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON && - ((gwin->bw->drag_type == DRAGGING_SELECTION) || - ami_autoscroll == TRUE)) + if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON) { ami_drag_icon_move(); - if((gwin->win->MouseX < bbox->Left) && - ((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD)) - drag_x_move = gwin->win->MouseX - bbox->Left; - if((gwin->win->MouseX > (bbox->Left + bbox->Width)) && - ((gwin->win->MouseX - (bbox->Left + bbox->Width)) < AMI_DRAG_THRESHOLD)) - drag_x_move = gwin->win->MouseX - (bbox->Left + bbox->Width); - if((gwin->win->MouseY < bbox->Top) && - ((gwin->win->MouseY - bbox->Top) > -AMI_DRAG_THRESHOLD)) - drag_y_move = gwin->win->MouseY - bbox->Top; - if((gwin->win->MouseY > (bbox->Top + bbox->Height)) && - ((gwin->win->MouseY - (bbox->Top + bbox->Height)) < AMI_DRAG_THRESHOLD)) - drag_y_move = gwin->win->MouseY - (bbox->Top + bbox->Height); + if(ami_autoscroll == TRUE) { + if((gwin->win->MouseX < bbox->Left) && + ((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD)) + drag_x_move = gwin->win->MouseX - bbox->Left; + if((gwin->win->MouseX > (bbox->Left + bbox->Width)) && + ((gwin->win->MouseX - (bbox->Left + bbox->Width)) < AMI_DRAG_THRESHOLD)) + drag_x_move = gwin->win->MouseX - (bbox->Left + bbox->Width); + if((gwin->win->MouseY < bbox->Top) && + ((gwin->win->MouseY - bbox->Top) > -AMI_DRAG_THRESHOLD)) + drag_y_move = gwin->win->MouseY - bbox->Top; + if((gwin->win->MouseY > (bbox->Top + bbox->Height)) && + ((gwin->win->MouseY - (bbox->Top + bbox->Height)) < AMI_DRAG_THRESHOLD)) + drag_y_move = gwin->win->MouseY - (bbox->Top + bbox->Height); + } } if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) diff --git a/amiga/gui_options.c b/amiga/gui_options.c index b7c69ffeb..27b3c6314 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -355,20 +355,20 @@ void ami_gui_opts_free(void) { int i; - for(i = 0; i++; i < OPTS_LAST) - if(gadlab[i]) FreeVec((APTR)gadlab[i]); + for(i = 0; i < OPTS_LAST; i++) + if(gadlab[i]) free((APTR)gadlab[i]); - for(i = 0; i++; i < OPTS_MAX_TABS) - if(tabs[i]) FreeVec((APTR)tabs[i]); + for(i = 0; i < OPTS_MAX_TABS; i++) + if(tabs[i]) free((APTR)tabs[i]); - for(i = 0; i++; i < OPTS_MAX_SCREEN) - if(screenopts[i]) FreeVec((APTR)screenopts[i]); + for(i = 0; i < OPTS_MAX_SCREEN; i++) + if(screenopts[i]) free((APTR)screenopts[i]); - for(i = 0; i++; i < OPTS_MAX_PROXY) - if(proxyopts[i]) FreeVec((APTR)proxyopts[i]); + for(i = 0; i < OPTS_MAX_PROXY; i++) + if(proxyopts[i]) free((APTR)proxyopts[i]); - for(i = 0; i++; i < OPTS_MAX_NATIVEBM) - if(nativebmopts[i]) FreeVec((APTR)nativebmopts[i]); + for(i = 0; i < OPTS_MAX_NATIVEBM; i++) + if(nativebmopts[i]) free((APTR)nativebmopts[i]); ami_gui_opts_websearch_free(websearch_list); } |