From f0acd5bfb7c47d2e7266f05cb54fc49443bc00ca Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 15 Jun 2009 18:41:14 +0000 Subject: Allow setting throbber speed in Theme definition file svn path=/trunk/netsurf/; revision=7807 --- amiga/gui.c | 25 ++++++++++++++++++++++--- amiga/resources/Themes/AISS/Theme | 1 + amiga/resources/Themes/Default/Theme | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index cccbc59ea..94076fc6b 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -74,6 +74,7 @@ #include "amiga/history_local.h" #include "amiga/font.h" #include "amiga/download.h" +#include #ifdef NS_AMIGA_CAIRO #include @@ -112,7 +113,7 @@ struct Library *KeymapBase = NULL; struct KeymapIFace *IKeymap = NULL; struct BitMap *throbber = NULL; -ULONG throbber_width,throbber_height,throbber_frames; +ULONG throbber_width,throbber_height,throbber_frames,throbber_update_interval; BOOL rmbtrapped; BOOL locked_screen = FALSE; @@ -422,6 +423,8 @@ void gui_init(int argc, char** argv) ami_get_theme_filename(throbberfile,"theme_throbber"); throbber_frames=atoi(messages_get("theme_throbber_frames")); + throbber_update_interval = atoi(messages_get("theme_throbber_delay")); + if(throbber_update_interval == 0) throbber_update_interval = 1000; if(dto = NewDTObject(throbberfile, DTA_GroupID,GID_PICTURE, @@ -2773,7 +2776,7 @@ void ami_update_throbber(struct gui_window_2 *g,bool redraw) if(!redraw) { - if(g->throbber_update_count < 1000) + if(g->throbber_update_count < throbber_update_interval) { g->throbber_update_count++; return; @@ -2789,7 +2792,23 @@ void ami_update_throbber(struct gui_window_2 *g,bool redraw) GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox); - BltBitMapRastPort(throbber,throbber_width*g->throbber_frame,0,g->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0); +/* + EraseRect(g->win->RPort,bbox->Left,bbox->Top, + bbox->Left+throbber_width,bbox->Top+throbber_height); +*/ + + BltBitMapTags(BLITA_SrcX,throbber_width*g->throbber_frame, + BLITA_SrcY,0, + BLITA_DestX,bbox->Left, + BLITA_DestY,bbox->Top, + BLITA_Width,throbber_width, + BLITA_Height,throbber_height, + BLITA_Source,throbber, + BLITA_Dest,g->win->RPort, + BLITA_SrcType,BLITT_BITMAP, + BLITA_DestType,BLITT_RASTPORT, +// BLITA_UseSrcAlpha,TRUE, + TAG_DONE); } void gui_window_place_caret(struct gui_window *g, int x, int y, int height) diff --git a/amiga/resources/Themes/AISS/Theme b/amiga/resources/Themes/AISS/Theme index b5ec285d7..d686bda06 100755 --- a/amiga/resources/Themes/AISS/Theme +++ b/amiga/resources/Themes/AISS/Theme @@ -29,6 +29,7 @@ theme_list_history:*TBImages:list_archive theme_list_sslcert:*TBImages:list_crypt theme_throbber:Throbber theme_throbber_frames:13 +theme_throbber_delay:500 ptr_default:*PROGDIR:Resources/Pointers/Default ptr_point:*PROGDIR:Resources/Pointers/Point ptr_caret:*PROGDIR:Resources/Pointers/Caret diff --git a/amiga/resources/Themes/Default/Theme b/amiga/resources/Themes/Default/Theme index 711a7ba42..58464dd85 100755 --- a/amiga/resources/Themes/Default/Theme +++ b/amiga/resources/Themes/Default/Theme @@ -42,6 +42,7 @@ theme_list_history: theme_list_sslcert: theme_throbber:Throbber theme_throbber_frames:9 +theme_throbber_delay:500 ptr_default:*PROGDIR:Resources/Pointers/Default ptr_point:*PROGDIR:Resources/Pointers/Point ptr_caret:*PROGDIR:Resources/Pointers/Caret -- cgit v1.2.3