mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make ami_autoscroll private to drag.c

This commit is contained in:
Chris Young 2016-06-01 18:40:14 +01:00
parent 0bbb4f5a2a
commit e1dea53d2a
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontends/amiga/drag.c
View File

@ -47,10 +47,11 @@
#include "amiga/theme.h"
struct Window *drag_icon = NULL;
ULONG drag_icon_width;
ULONG drag_icon_height;
BOOL drag_in_progress = FALSE;
static struct Window *drag_icon = NULL;
static ULONG drag_icon_width;
static ULONG drag_icon_height;
static BOOL drag_in_progress = FALSE;
static bool ami_autoscroll = false;
void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
gui_save_type type)
@ -97,7 +98,7 @@ void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
ami_drag_icon_show(g->shared->win, "ascii");
ami_autoscroll = TRUE;
ami_autoscroll = true;
drag_save_data = g;
drag_save = GUI_SAVE_TEXT_SELECTION;
}
@ -108,7 +109,7 @@ void ami_drag_save(struct Window *win)
char path[1025], dpath[1025];
ami_drag_icon_close(NULL);
ami_autoscroll = FALSE;
ami_autoscroll = true;
if(nsoption_charp(pubscreen_name) && (strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0))
{
@ -246,13 +247,15 @@ void ami_drag_icon_show(struct Window *win, const char *type)
TAG_DONE);
}
void ami_drag_icon_move(void)
bool ami_drag_icon_move(void)
{
if(drag_icon == NULL) return;
if(drag_icon == NULL) return FALSE;
ChangeWindowBox(drag_icon, scrn->MouseX - (drag_icon_width / 2),
scrn->MouseY - (drag_icon_height / 2),
drag_icon_width, drag_icon_height);
return ami_autoscroll;
}
/**
@ -335,7 +338,7 @@ void ami_drag_icon_close(struct Window *win)
{
}
void ami_drag_icon_move(void)
bool ami_drag_icon_move(void)
{
}

2
frontends/amiga/drag.h
View File

@ -36,7 +36,7 @@ void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, gui_sa
void ami_drag_save(struct Window *win);
void ami_drag_icon_show(struct Window *win, const char *type);
void ami_drag_icon_close(struct Window *win);
void ami_drag_icon_move(void);
bool ami_drag_icon_move(void);
BOOL ami_drag_in_progress(void);
void *ami_window_at_pointer(int type);

4
frontends/amiga/gui.c
View File

@ -1989,9 +1989,7 @@ static void ami_handle_msg(void)
if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON)
{
ami_drag_icon_move();
if(ami_autoscroll == TRUE) {
if(ami_drag_icon_move() == TRUE) {
if((gwin->win->MouseX < bbox->Left) &&
((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD))
drag_x_move = gwin->win->MouseX - bbox->Left;

1
frontends/amiga/gui.h
View File

@ -174,7 +174,6 @@ struct MinList *window_list;
struct Screen *scrn;
struct MsgPort *sport;
struct gui_window *cur_gw;
BOOL ami_autoscroll;
void ami_get_msg(void);
void ami_try_quit(void);