mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 01:09:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make throbber operate correctly according to the tab currently displayed.

Browse Source 
svn path=/trunk/netsurf/; revision=9547
This commit is contained in:
Chris Young 2009-09-06 10:48:14 +00:00
parent cd07aa9d31
commit dac634f6fd
2 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
amiga/gui.c
View File

@ -1251,7 +1251,7 @@ ie_qualifier anyway
if(gwin->redraw_required) if(gwin->redraw_required)
ami_do_redraw(gwin); ami_do_redraw(gwin);
if(gwin->throbber_frame) if(gwin->bw->window->throbbing)
ami_update_throbber(gwin,false); ami_update_throbber(gwin,false);
if(gwin->bw->window->c_h) if(gwin->bw->window->c_h)
@ -2999,43 +2999,76 @@ void gui_window_set_url(struct gui_window *g, const char *url)
void gui_window_start_throbber(struct gui_window *g) void gui_window_start_throbber(struct gui_window *g)
{ {
struct IBox *bbox; struct IBox *bbox;
GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox); ULONG cur_tab = 0;
g->shared->throbber_frame=1; if(!g) return;
BltBitMapRastPort(throbber,throbber_width,0,g->shared->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0); if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
g->throbbing = true;
if((cur_tab == g->tab) || (g->shared->tabs == 0))
{
GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox);
if(g->shared->throbber_frame == 0) g->shared->throbber_frame=1;
BltBitMapRastPort(throbber,throbber_width,0,g->shared->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0);
}
} }
void gui_window_stop_throbber(struct gui_window *g) void gui_window_stop_throbber(struct gui_window *g)
{ {
struct IBox *bbox; struct IBox *bbox;
GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox); ULONG cur_tab = 0;
BltBitMapRastPort(throbber,0,0,g->shared->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0); if(!g) return;
g->shared->throbber_frame = 0; if(g->tab_node) GetAttr(CLICKTAB_Current, g->shared->gadgets[GID_TABS],
(ULONG *)&cur_tab);
g->throbbing = false;
if((cur_tab == g->tab) || (g->shared->tabs == 0))
{
GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox);
BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left,
bbox->Top, throbber_width, throbber_height, 0x0C0);
}
// g->shared->throbber_frame = 0;
} }
void ami_update_throbber(struct gui_window_2 *g,bool redraw) void ami_update_throbber(struct gui_window_2 *g,bool redraw)
{ {
struct IBox *bbox; struct IBox *bbox;
int frame = g->throbber_frame;
if(!g) return;
if(!g->gadgets[GID_THROBBER]) return; if(!g->gadgets[GID_THROBBER]) return;
if(!redraw) if(g->bw->window->throbbing == false)
{ {
if(g->throbber_update_count < throbber_update_interval) frame = 0;
g->throbber_frame=1;
}
else
{
if(!redraw)
{ {
g->throbber_update_count++; if(g->throbber_update_count < throbber_update_interval)
return; {
g->throbber_update_count++;
return;
}
g->throbber_update_count = 0;
g->throbber_frame++;
if(g->throbber_frame > (throbber_frames-1))
g->throbber_frame=1;
} }
g->throbber_update_count = 0;
g->throbber_frame++;
if(g->throbber_frame > (throbber_frames-1))
g->throbber_frame=1;
} }
GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox); GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox);
@ -3045,7 +3078,7 @@ void ami_update_throbber(struct gui_window_2 *g,bool redraw)
bbox->Left+throbber_width,bbox->Top+throbber_height); bbox->Left+throbber_width,bbox->Top+throbber_height);
*/ */
BltBitMapTags(BLITA_SrcX,throbber_width*g->throbber_frame, BltBitMapTags(BLITA_SrcX, throbber_width * frame,
BLITA_SrcY,0, BLITA_SrcY,0,
BLITA_DestX,bbox->Left, BLITA_DestX,bbox->Left,
BLITA_DestY,bbox->Top, BLITA_DestY,bbox->Top,

1
amiga/gui.h
View File

@ -114,6 +114,7 @@ struct gui_window
int scrolly; int scrolly;
struct history_window *hw; struct history_window *hw;
struct List dllist; struct List dllist;
bool throbbing;
}; };
void ami_get_msg(void); void ami_get_msg(void);