STR #1868: fixed horizontal scrolbar in help view thanks to wavexx

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6029 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-02-20 17:39:07 +00:00
parent fe9e4fe1e7
commit 28c87ce84d
2 changed files with 4 additions and 3 deletions
+1
View File
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8
STR #1742, STR #1777, STR #1794, STR #1827, STR #1843, STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
STR #1796, STR #1815, STR #1726, STR #1753, STR #1855, STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
STR #1862, STR #1867, STR #1874) STR #1862, STR #1867, STR #1874)
- Fixed width calculation in Fl_Help_ViewA (STR #1868)
- Fixed offset bug in OS X pixmap code (STR #1856) - Fixed offset bug in OS X pixmap code (STR #1856)
- Fixed potential buffer overrun - Fixed potential buffer overrun
in Fl_Preferences (STR #1853) in Fl_Preferences (STR #1853)
+3 -3
View File
@@ -1101,7 +1101,7 @@ Fl_Help_View::format()
// Reset document width... // Reset document width...
hsize_ = w() - Fl::scrollbar_size(); hsize_ = w() - Fl::scrollbar_size() - Fl::box_dw(b);
done = 0; done = 0;
while (!done) while (!done)
@@ -1853,14 +1853,14 @@ Fl_Help_View::format()
// Reset scrolling if it needs to be... // Reset scrolling if it needs to be...
if (scrollbar_.visible()) { if (scrollbar_.visible()) {
int temph = h() - Fl::box_dh(box()); int temph = h() - Fl::box_dh(b);
if (hscrollbar_.visible()) temph -= ss; if (hscrollbar_.visible()) temph -= ss;
if ((topline_ + temph) > size_) topline(size_ - temph); if ((topline_ + temph) > size_) topline(size_ - temph);
else topline(topline_); else topline(topline_);
} else topline(0); } else topline(0);
if (hscrollbar_.visible()) { if (hscrollbar_.visible()) {
int tempw = w() - ss - Fl::box_dw(box()); int tempw = w() - ss - Fl::box_dw(b);
if ((leftline_ + tempw) > hsize_) leftline(hsize_ - tempw); if ((leftline_ + tempw) > hsize_) leftline(hsize_ - tempw);
else leftline(leftline_); else leftline(leftline_);
} else leftline(0); } else leftline(0);