diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-02-20 17:39:07 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-02-20 17:39:07 +0000 |
| commit | 28c87ce84df0ed491f2236013a360581ba43e760 (patch) | |
| tree | edfcac72ce702cdb29eba55e86fa92d6863a01de | |
| parent | fe9e4fe1e794d4da0ed5068de1a6ba958b8479e8 (diff) | |
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
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8 STR #1742, STR #1777, STR #1794, STR #1827, STR #1843, STR #1796, STR #1815, STR #1726, STR #1753, STR #1855, 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 potential buffer overrun in Fl_Preferences (STR #1853) diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index e4d2377da..192b35893 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1101,7 +1101,7 @@ Fl_Help_View::format() // Reset document width... - hsize_ = w() - Fl::scrollbar_size(); + hsize_ = w() - Fl::scrollbar_size() - Fl::box_dw(b); done = 0; while (!done) @@ -1853,14 +1853,14 @@ Fl_Help_View::format() // Reset scrolling if it needs to be... if (scrollbar_.visible()) { - int temph = h() - Fl::box_dh(box()); + int temph = h() - Fl::box_dh(b); if (hscrollbar_.visible()) temph -= ss; if ((topline_ + temph) > size_) topline(size_ - temph); else topline(topline_); } else topline(0); 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); else leftline(leftline_); } else leftline(0); |