Author: matt
Date: 2008-02-20 09:39:07 -0800 (Wed, 20 Feb 2008)
New Revision: 6029
Log:
STR #1868: fixed horizontal scrolbar in help view thanks to wavexx
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/src/Fl_Help_View.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2008-02-20 17:31:39 UTC (rev 6028)
+++ branches/branch-1.1/CHANGES 2008-02-20 17:39:07 UTC (rev 6029)
@@ -6,6 +6,7 @@
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)
Modified: branches/branch-1.1/src/Fl_Help_View.cxx
===================================================================
--- branches/branch-1.1/src/Fl_Help_View.cxx 2008-02-20 17:31:39 UTC (rev
6028)
+++ branches/branch-1.1/src/Fl_Help_View.cxx 2008-02-20 17:39:07 UTC (rev
6029)
@@ -1101,7 +1101,7 @@
// 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 @@
// 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);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
