From 8f4fa005746deb8dd7e34cd07acaa55d50d59fe9 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 23 Jul 2004 21:12:24 +0000 Subject: Fl_Counter didn't use a thin down box for the text field if the box type was set to FL_THIN_UP_BOX (STR #467) Fl_Help_View now resets the scrollbars if they go outside the current view (STR #464) fl_dir_chooser() did not show the previous selection as documented (STR #443) Fl_Text_Display used delete[] instead of free() in some places (STR #466) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3691 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Help_View.cxx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/Fl_Help_View.cxx') diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 28c798e9b..36ae551f3 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.50 2004/07/04 23:27:48 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.51 2004/07/23 21:12:24 easysw Exp $" // // Fl_Help_View widget routines. // @@ -1568,8 +1568,19 @@ Fl_Help_View::format() } } - topline(topline_); - leftline(leftline_); + // Reset scrolling if it needs to be... + if (scrollbar_.visible()) { + int hh = h() - 8; + if (hscrollbar_.visible()) hh -= 16; + if ((topline_ + hh) > size_) topline(size_ - hh); + else topline(topline_); + } else topline(0); + + if (hscrollbar_.visible()) { + int ww = w() - 24; + if ((leftline_ + ww) > hsize_) leftline(hsize_ - ww); + else leftline(leftline_); + } else leftline(0); } @@ -2795,5 +2806,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.50 2004/07/04 23:27:48 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.51 2004/07/23 21:12:24 easysw Exp $". // -- cgit v1.2.3