summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2005-09-13 08:43:28 +0000
committerMatthias Melcher <fltk@matthiasm.com>2005-09-13 08:43:28 +0000
commit02ab74fceee2c73a182ce32a94e3573c22d9d822 (patch)
treed4cf76b12301c56eb51ce7069f931d5d6d2a7308
parentc526a7ad2f4b31a6342edb888c8a1925365821ce (diff)
Fixed x-offset problem in Help_Widget (STR #998)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4566 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--src/Fl_Help_View.cxx8
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 884beaa95..3ba355373 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #571, STR #648, STR #692, STR
#730, STR #744, STR #745, STR #931, STR #942, STR #960,
STR #969)
+ - Fixed x-offset problem in Help_Widget (STR #998)
- Clipboard will persist if owner window is hidden (STR #1019)
- Fixed handling of Win32 Device Contexts (STR #1007)
- Fixed C Plus Plus style comments in C files (STR #997)
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 40ab5cef8..86e45fd3a 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -1291,8 +1291,14 @@ Fl_Help_View::format()
xx -= 4 * fsize;
block->h += fsize + 2;
}
- else if (strcasecmp(buf, "/TABLE") == 0)
+ else if (strcasecmp(buf, "/TABLE") == 0)
+ {
block->h += fsize + 2;
+ // the current block is *not* the table block, so the current xx is
+ // meaningless. Set it back to page x, so the next block will be aligned
+ // reasonably. This fails fro table-in-table html!
+ xx = 4;
+ }
else if (strcasecmp(buf, "/PRE") == 0)
{
pre = 0;