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

More calculation fixes 

svn path=/trunk/netsurf/; revision=10567
This commit is contained in:
Chris Young 2010-06-06 18:50:48 +00:00
parent 915cc68201
commit 9bc784e8d7
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
amiga/gui.c
View File

@ -2134,7 +2134,6 @@ void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
GA_RelVerify, TRUE, GA_RelVerify, TRUE,
GA_HintInfo, gwin->helphints[GID_ADDTAB], GA_HintInfo, gwin->helphints[GID_ADDTAB],
GA_Text, "+", GA_Text, "+",
BUTTON_Transparent, TRUE,
BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM], BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
ButtonEnd; ButtonEnd;
@ -2412,7 +2411,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
gwin->shared->objects[GID_CLOSETAB] = ButtonObject, gwin->shared->objects[GID_CLOSETAB] = ButtonObject,
GA_ID, GID_CLOSETAB, GA_ID, GID_CLOSETAB,
GA_RelVerify, TRUE, GA_RelVerify, TRUE,
BUTTON_Transparent, TRUE,
BUTTON_RenderImage, gwin->shared->objects[GID_CLOSETAB_BM], BUTTON_RenderImage, gwin->shared->objects[GID_CLOSETAB_BM],
ButtonEnd; ButtonEnd;
@ -2428,7 +2426,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_ID, GID_ADDTAB, GA_ID, GID_ADDTAB,
GA_RelVerify, TRUE, GA_RelVerify, TRUE,
GA_Text, "+", GA_Text, "+",
BUTTON_Transparent, TRUE,
BUTTON_RenderImage, gwin->shared->objects[GID_ADDTAB_BM], BUTTON_RenderImage, gwin->shared->objects[GID_ADDTAB_BM],
ButtonEnd; ButtonEnd;
} }
@ -2483,7 +2480,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_RelVerify,TRUE, GA_RelVerify,TRUE,
GA_Disabled,TRUE, GA_Disabled,TRUE,
GA_HintInfo, gwin->shared->helphints[GID_BACK], GA_HintInfo, gwin->shared->helphints[GID_BACK],
BUTTON_Transparent,TRUE,
BUTTON_RenderImage,BitMapObject, BUTTON_RenderImage,BitMapObject,
BITMAP_SourceFile,nav_west, BITMAP_SourceFile,nav_west,
BITMAP_SelectSourceFile,nav_west_s, BITMAP_SelectSourceFile,nav_west_s,
@ -2499,7 +2495,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_RelVerify,TRUE, GA_RelVerify,TRUE,
GA_Disabled,TRUE, GA_Disabled,TRUE,
GA_HintInfo, gwin->shared->helphints[GID_FORWARD], GA_HintInfo, gwin->shared->helphints[GID_FORWARD],
BUTTON_Transparent,TRUE,
BUTTON_RenderImage,BitMapObject, BUTTON_RenderImage,BitMapObject,
BITMAP_SourceFile,nav_east, BITMAP_SourceFile,nav_east,
BITMAP_SelectSourceFile,nav_east_s, BITMAP_SelectSourceFile,nav_east_s,
@ -2514,7 +2509,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_ID,GID_STOP, GA_ID,GID_STOP,
GA_RelVerify,TRUE, GA_RelVerify,TRUE,
GA_HintInfo, gwin->shared->helphints[GID_STOP], GA_HintInfo, gwin->shared->helphints[GID_STOP],
BUTTON_Transparent,TRUE,
BUTTON_RenderImage,BitMapObject, BUTTON_RenderImage,BitMapObject,
BITMAP_SourceFile,stop, BITMAP_SourceFile,stop,
BITMAP_SelectSourceFile,stop_s, BITMAP_SelectSourceFile,stop_s,
@ -2529,7 +2523,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_ID,GID_RELOAD, GA_ID,GID_RELOAD,
GA_RelVerify,TRUE, GA_RelVerify,TRUE,
GA_HintInfo, gwin->shared->helphints[GID_RELOAD], GA_HintInfo, gwin->shared->helphints[GID_RELOAD],
BUTTON_Transparent,TRUE,
BUTTON_RenderImage,BitMapObject, BUTTON_RenderImage,BitMapObject,
BITMAP_SourceFile,reload, BITMAP_SourceFile,reload,
BITMAP_SelectSourceFile,reload_s, BITMAP_SelectSourceFile,reload_s,
@ -2544,7 +2537,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
GA_ID,GID_HOME, GA_ID,GID_HOME,
GA_RelVerify,TRUE, GA_RelVerify,TRUE,
GA_HintInfo, gwin->shared->helphints[GID_HOME], GA_HintInfo, gwin->shared->helphints[GID_HOME],
BUTTON_Transparent,TRUE,
BUTTON_RenderImage,BitMapObject, BUTTON_RenderImage,BitMapObject,
BITMAP_SourceFile,home, BITMAP_SourceFile,home,
BITMAP_SelectSourceFile,home_s, BITMAP_SelectSourceFile,home_s,
@ -3291,10 +3283,10 @@ void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
if(sx < 0) sx=0; if(sx < 0) sx=0;
if(sy < 0) sy=0; if(sy < 0) sy=0;
if(sx >= content_get_width(g->shared->bw->current_content)) if(sx >= content_get_width(g->shared->bw->current_content) - bbox->Width)
sx = content_get_width(g->shared->bw->current_content); sx = content_get_width(g->shared->bw->current_content) - bbox->Width;
if(sy >= content_get_height(g->shared->bw->current_content)) if(sy >= (content_get_height(g->shared->bw->current_content) - bbox->Height))
sy = content_get_height(g->shared->bw->current_content); sy = content_get_height(g->shared->bw->current_content) - bbox->Height;
if(content_get_width(g->shared->bw->current_content) <= bbox->Width) sx = 0; if(content_get_width(g->shared->bw->current_content) <= bbox->Width) sx = 0;
if(content_get_height(g->shared->bw->current_content) <= bbox->Height) sy = 0; if(content_get_height(g->shared->bw->current_content) <= bbox->Height) sy = 0;