From 70ca1d156ba8bb0aa1b3a925b89f935fe4dccfbe Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 11 Mar 2004 05:17:12 +0000 Subject: Fl_Value_Slider::draw_bg() didn't always apply the clipping rectangle (STR #235) fl_filename_relative() returned the wrong string if the absolute pathname was equal to the current working directory (STR #224) Fl_Help_Dialog didn't correctly restore the scroll position when going forward/back in the link history if the file changed (STR #218) glutGetModifiers() did not mask off extra state bits, confusing some GLUT-based applications (STR #213) Fixed mouse capture problems on MacOS X (STR #209, STR #229) Fl_Sys_Menu_Bar is now built into the library for MacOS X (STR #229) Fl_Menu_ now provides item_pathname() methods to get the "pathname" of a menu item, e.g. "File/Quit" (STR #283) Fl_Text_Display now provides cursor_color() methods to get and set the cursor color (STR #271) Fl_Scroll didn't honor FL_NO_BOX (STR #305) FLUID declaration blocks didn't support public/private definitions (STR #301) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Scroll.cxx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/Fl_Scroll.cxx') diff --git a/src/Fl_Scroll.cxx b/src/Fl_Scroll.cxx index 7d09eb8ae..6e2f6a7a7 100644 --- a/src/Fl_Scroll.cxx +++ b/src/Fl_Scroll.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.5 2003/06/15 04:41:16 easysw Exp $" +// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.6 2004/03/11 05:17:12 easysw Exp $" // // Scroll widget for the Fast Light Tool Kit (FLTK). // @@ -74,13 +74,15 @@ void Fl_Scroll::draw_clip(void* v,int X, int Y, int W, int H) { if (NB > B) B = NB; } // fill any area to right & bottom of widgets: - if (R < X+W && B > Y) { - fl_color(s->color()); - fl_rectf(R,Y,X+W-R,B-Y); - } - if (B < Y+H) { - fl_color(s->color()); - fl_rectf(X,B,W,Y+H-B); + if (s->box()) { + if (R < X+W && B > Y) { + fl_color(s->color()); + fl_rectf(R,Y,X+W-R,B-Y); + } + if (B < Y+H) { + fl_color(s->color()); + fl_rectf(X,B,W,Y+H-B); + } } fl_pop_clip(); } @@ -266,5 +268,5 @@ int Fl_Scroll::handle(int event) { } // -// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.5 2003/06/15 04:41:16 easysw Exp $". +// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.6 2004/03/11 05:17:12 easysw Exp $". // -- cgit v1.2.3