Author: tlsa Date: Sun Feb 3 18:44:24 2008 New Revision: 3833 URL: http://source.netsurf-browser.org?rev=3833&view=rev Log: Improve float positioning. Modified: trunk/netsurf/!NetSurf/!Run,feb trunk/netsurf/makefile trunk/netsurf/render/layout.c Modified: trunk/netsurf/!NetSurf/!Run,feb URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/%21Run%2Cfeb?r... ============================================================================== --- trunk/netsurf/!NetSurf/!Run,feb (original) +++ trunk/netsurf/!NetSurf/!Run,feb Sun Feb 3 18:44:24 2008 @@ -99,7 +99,7 @@ | NB: trailing dot is required FontInstall NetSurf:Resources.Fonts. -WimpSlot -min 2240k -max 2240k +WimpSlot -min 3540k -max 3540k Run <NetSurf$Dir>.!RunImage -v %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log | Uninstall NetSurf-specific fonts Modified: trunk/netsurf/makefile URL: http://source.netsurf-browser.org/trunk/netsurf/makefile?rev=3833&r1=... ============================================================================== --- trunk/netsurf/makefile (original) +++ trunk/netsurf/makefile Sun Feb 3 18:44:24 2008 @@ -72,40 +72,40 @@ gtk_history.o gtk_window.o gtk_filetype.o \ gtk_download.o # gtk/ -# This makes me want to vomit, but is necessary to avoid a load of -# "make: /home/riscos/cross/bin/gcc: Command not found." if there's no GCCSDK -# installed on the build machine. The new build system can't happen soon enough -OBJDIR_RISCOS = $(shell $(CC) -dumpmachine 2>/dev/null || echo arm-riscos-aof) -SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c) -OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o) - -OBJDIR_RISCOS_SMALL = $(OBJDIR_RISCOS)-small -SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c) -OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o) - -OBJDIR_DEBUG = $(shell $(SYSTEM_CC) -dumpmachine)-debug -SOURCES_DEBUG=$(OBJECTS_DEBUG:.o=.c) -OBJS_DEBUG=$(OBJECTS_DEBUG:%.o=$(OBJDIR_DEBUG)/%.o) - -OBJS_DEBUGRO=$(OBJECTS_DEBUGRO:%.o=$(OBJDIR_RISCOS)/%.o) - -OBJDIR_GTK = objects-gtk -SOURCES_GTK=$(OBJECTS_GTK:.o=.c) -OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o) - # Default target - platform specific files may specify special-case rules for # various files. default: riscos + # Inclusion of platform specific files has to occur after the OBJDIR stuff as # that is referred to in the files -OS = $(word 2,$(subst -, ,$(shell $(SYSTEM_CC) -dumpmachine))) +OS = riscos ifeq ($(OS),riscos) include riscos.mk else include posix.mk endif + + +OBJDIR_RISCOS = arm-riscos-aof +SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c) +OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o) + +OBJDIR_RISCOS_SMALL = $(shell $(CC) -dumpmachine)-small +SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c) +OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o) + +OBJDIR_DEBUG = $(shell $(SYSTEM_CC) -dumpmachine)-debug +SOURCES_DEBUG=$(OBJECTS_DEBUG:.o=.c) +OBJS_DEBUG=$(OBJECTS_DEBUG:%.o=$(OBJDIR_DEBUG)/%.o) + +OBJS_DEBUGRO=$(OBJECTS_DEBUGRO:%.o=$(OBJDIR_RISCOS)/%.o) + +OBJDIR_GTK = objects-gtk +SOURCES_GTK=$(OBJECTS_GTK:.o=.c) +OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o) + VPATH = content:content/fetchers:css:desktop:image:render:riscos:riscos/configure:riscos/gui:utils:debug:gtk Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=3833&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Sun Feb 3 18:44:24 2008 @@ -844,7 +844,7 @@ for (; fl; fl = fl->next_float) { fy0 = fl->y; fy1 = fl->y + fl->height; - if (y0 <= fy1 && fy0 <= y1) { + if (y0 < fy1 && fy0 <= y1) { if (fl->type == BOX_FLOAT_LEFT) { fx1 = fl->x + fl->width; if (*x0 < fx1) {