diff options
| -rw-r--r-- | !NetSurf/!Run,feb | 2 | ||||
| -rw-r--r-- | makefile | 36 | ||||
| -rw-r--r-- | render/layout.c | 8 | ||||
| -rw-r--r-- | riscos.mk | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb index 7828c21fc..156435039 100644 --- a/!NetSurf/!Run,feb +++ b/!NetSurf/!Run,feb @@ -99,7 +99,7 @@ CDir <Wimp$ScrapDir>.WWW.NetSurf | 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 @@ -72,14 +72,27 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ 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) +# 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 = 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 = $(OBJDIR_RISCOS)-small +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) @@ -93,19 +106,6 @@ 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))) -ifeq ($(OS),riscos) -include riscos.mk -else -include posix.mk -endif VPATH = content:content/fetchers:css:desktop:image:render:riscos:riscos/configure:riscos/gui:utils:debug:gtk diff --git a/render/layout.c b/render/layout.c index f5dca7c89..7be5e7ed6 100644 --- a/render/layout.c +++ b/render/layout.c @@ -1381,7 +1381,7 @@ bool layout_line(struct box *first, int *width, int *y, } else { /* doesn't fit: place below */ place_float_below(b, *width, - cx, cy + height + 1, cont); + cx, cy + height, cont); } if (cont->float_children == b) { LOG(("float %p already placed", b)); @@ -1871,11 +1871,11 @@ void place_float_below(struct box *c, int width, int cx, int y, yy = (left->y + left->height < right->y + right->height ? left->y + left->height : - right->y + right->height) + 1; + right->y + right->height); } else if (left == 0 && right != 0) { - yy = right->y + right->height + 1; + yy = right->y + right->height; } else if (left != 0 && right == 0) { - yy = left->y + left->height + 1; + yy = left->y + left->height; } } while (!((left == 0 && right == 0) || (c->width < x1 - x0))); @@ -9,7 +9,7 @@ PLATFORM_AFLAGS_RISCOS = -mthrowback -IOSLib: LDFLAGS_RISCOS = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \ NSLibs:lib/libssl NSLibs:lib/libcrypto NSLibs:lib/libcares \ NSLibs:lib/libmng NSLibs:lib/libjpeg NSLibs:lib/librufl NSLibs:lib/libpencil \ - OSLib:o.OSLib32 + OSLib:o.OSLib32 NSLibs:lib/libsvgtiny LDFLAGS_SMALL = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \ NSLibs:lib/libares NSLibs:lib/libmng \ NSLibs:lib/libjpeg OSLib:o.oslib32 |