Author: chris_y Date: Sat Aug 29 09:24:47 2009 New Revision: 9496 URL: http://source.netsurf-browser.org?rev=9496&view=rev Log: Font scaling - scaling now works for printing, need 2nd attempt at implementing it for browsing. Modified: trunk/netsurf/amiga/font.c trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/plotters.c trunk/netsurf/amiga/plotters.h trunk/netsurf/amiga/print.c Modified: trunk/netsurf/amiga/font.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/font.c?rev=9496&... ============================================================================== --- trunk/netsurf/amiga/font.c (original) +++ trunk/netsurf/amiga/font.c Sat Aug 29 09:24:47 2009 @@ -269,7 +269,7 @@ } /* Scale to 16.16 fixed point */ - ysize = fstyle->size * ((1 << 16) / FONT_SIZE_SCALE); + ysize = fstyle->size * ((1 << 16) / FONT_SIZE_SCALE) * glob->scale; if(ESetInfo(&ofont->olf_EEngine, OT_DeviceDPI,(72<<16) | 72, Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=9496&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Aug 29 09:24:47 2009 @@ -2403,7 +2403,9 @@ if((x1-x0)+(xoffset+x0-sx)>(width)) x1 = (width-(x0-sx)+x0); if((y1-y0)+(yoffset+y0-sy)>(height)) y1 = (height-(y0-sy)+y0); - content_redraw(c, + glob->scale = g->shared->bw->scale; + + content_redraw(c, -sx,-sy,width-sx,height-sy, floorf((x0 * g->shared->bw->scale)-sx), @@ -2541,6 +2543,7 @@ else { ami_clg(0xffffff); + glob->scale = g->bw->scale; if(c->type == CONTENT_HTML) { Modified: trunk/netsurf/amiga/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=9496... ============================================================================== --- trunk/netsurf/amiga/plotters.c (original) +++ trunk/netsurf/amiga/plotters.c Sat Aug 29 09:24:47 2009 @@ -116,6 +116,7 @@ if(!width) width = scrn->Width; if(!height) height = scrn->Width; + gg->scale = 1.0; gg->layerinfo = NewLayerInfo(); gg->areabuf = AllocVec(100,MEMF_PRIVATE | MEMF_CLEAR); gg->tmprasbuf = AllocVec(width*height,MEMF_PRIVATE | MEMF_CLEAR); Modified: trunk/netsurf/amiga/plotters.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.h?rev=9496... ============================================================================== --- trunk/netsurf/amiga/plotters.h (original) +++ trunk/netsurf/amiga/plotters.h Sat Aug 29 09:24:47 2009 @@ -33,6 +33,7 @@ APTR areabuf; APTR tmprasbuf; struct Rectangle rect; + float scale; #ifdef NS_AMIGA_CAIRO cairo_surface_t *surface; cairo_t *cr; Modified: trunk/netsurf/amiga/print.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/print.c?rev=9496&am... ============================================================================== --- trunk/netsurf/amiga/print.c (original) +++ trunk/netsurf/amiga/print.c Sat Aug 29 09:24:47 2009 @@ -141,6 +141,7 @@ ami_print_info.PED->ped_MaxXDots, ami_print_info.PED->ped_MaxYDots); + ami_print_info.gg->scale = ps->scale; ami_print_info.page = 0; return true;