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

Improve float positioning. 

svn path=/trunk/netsurf/; revision=3833
This commit is contained in:
Michael Drake 2008-02-03 18:44:24 +00:00
parent 35e8419fc6
commit 7177f59309
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
!NetSurf/!Run,feb
View File

@ -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

36
makefile
View File

@ -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

2
render/layout.c
View File

@ -844,7 +844,7 @@ void find_sides(struct box *fl, int y0, int y1,
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) {