From 4cea3aee0c4153c7b7c2fc485b2e4ef37cbd3f19 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 9 Jul 2015 00:10:44 +0000 Subject: Fix box background drawing for deactivated widgets (STR #2907). Two new static methods have been introduced: - Fl::box_color(Fl_Color c) returns the bg color dependent on the widget's state (inactive_r()). - Fl::set_box_color(Fl_Color c) sets the correct bg color dependent on the widget's state by calling fl_color(Fl::box_color(c)). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10781 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_diamond_box.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/fl_diamond_box.cxx') diff --git a/src/fl_diamond_box.cxx b/src/fl_diamond_box.cxx index 9aa3aad88..deafd7bd0 100644 --- a/src/fl_diamond_box.cxx +++ b/src/fl_diamond_box.cxx @@ -32,7 +32,8 @@ static void fl_diamond_up_box(int x,int y,int w,int h,Fl_Color bgcolor) { h &= -2; int x1 = x+w/2; int y1 = y+h/2; - fl_color(bgcolor); fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); + Fl::set_box_color(bgcolor); + fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); const uchar *g = fl_gray_ramp(); fl_color(g[(int)'W']); fl_line(x+1, y1, x1, y+1, x+w-1, y1); fl_color(g[(int)'U']); fl_line(x+2, y1, x1, y+2, x+w-2, y1); @@ -55,7 +56,8 @@ static void fl_diamond_down_box(int x,int y,int w,int h,Fl_Color bgcolor) { fl_color(g[(int)'W']); fl_line(x+2, y1, x1, y+h-2, x+w-2, y1); fl_color(g[(int)'U']); fl_line(x+1, y1, x1, y+h-1, x+w-1, y1); fl_color(g[(int)'S']); fl_line(x+0, y1, x1, y+h-0, x+w-0, y1); - fl_color(bgcolor); fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); + Fl::set_box_color(bgcolor); + fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); fl_color(g[(int)'A']); fl_loop(x+3, y1, x1, y+3, x+w-3, y1, x1, y+h-3); } -- cgit v1.2.3