Checkbox uses now disabled text color when disabled.

Changed colors for window-title caption to keep them readable when not active.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2865 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CGUICheckBox.cpp

@@ -154,7 +154,7 @@ void CGUICheckBox::draw()
 		IGUIFont* font = skin->getFont();
 		if (font)
 			font->draw(Text.c_str(), checkRect,
-			skin->getColor(EGDC_BUTTON_TEXT), false, true, &AbsoluteClippingRect);
+					skin->getColor(IsEnabled ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), false, true, &AbsoluteClippingRect);
 	}
 
 	IGUIElement::draw();

source/Irrlicht/CGUISkin.cpp

@@ -31,14 +31,14 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 		Colors[EGDC_3D_HIGH_LIGHT]    = video::SColor(101,255,255,255);
 		Colors[EGDC_3D_LIGHT]         =	video::SColor(101,210,210,210);
 		Colors[EGDC_ACTIVE_BORDER]    = video::SColor(101,16,14,115);
-		Colors[EGDC_ACTIVE_CAPTION]   = video::SColor(200,255,255,255);
+		Colors[EGDC_ACTIVE_CAPTION]   = video::SColor(255,255,255,255);
 		Colors[EGDC_APP_WORKSPACE]    = video::SColor(101,100,100,100);
 		Colors[EGDC_BUTTON_TEXT]      = video::SColor(240,10,10,10);
 		Colors[EGDC_GRAY_TEXT]        = video::SColor(240,130,130,130);
 		Colors[EGDC_HIGH_LIGHT]       = video::SColor(101,8,36,107);
 		Colors[EGDC_HIGH_LIGHT_TEXT]  = video::SColor(240,255,255,255);
 		Colors[EGDC_INACTIVE_BORDER]  = video::SColor(101,165,165,165);
-		Colors[EGDC_INACTIVE_CAPTION] = video::SColor(101,210,210,210);
+		Colors[EGDC_INACTIVE_CAPTION] = video::SColor(255,30,30,30);
 		Colors[EGDC_TOOLTIP]          = video::SColor(200,0,0,0);
 		Colors[EGDC_TOOLTIP_BACKGROUND]= video::SColor(200,255,255,225);
 		Colors[EGDC_SCROLLBAR]        = video::SColor(101,230,230,230);
@@ -72,14 +72,14 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 		Colors[EGDC_3D_HIGH_LIGHT]	=	0x40c7ccdc;
 		Colors[EGDC_3D_LIGHT]		=	0x802e313a;
 		Colors[EGDC_ACTIVE_BORDER]	=	0x80404040;		// window title
-		Colors[EGDC_ACTIVE_CAPTION] =	0xf0d0d0d0;
+		Colors[EGDC_ACTIVE_CAPTION] =	0xffd0d0d0;
 		Colors[EGDC_APP_WORKSPACE]	=	0xc0646464;		// unused
 		Colors[EGDC_BUTTON_TEXT]	=	0xd0161616;
 		Colors[EGDC_GRAY_TEXT]		=	0x3c141414;
 		Colors[EGDC_HIGH_LIGHT]		=	0x6c606060;
 		Colors[EGDC_HIGH_LIGHT_TEXT]=	0xd0e0e0e0;
 		Colors[EGDC_INACTIVE_BORDER]=	0xf0a5a5a5;
-		Colors[EGDC_INACTIVE_CAPTION]=	0xf0d2d2d2;
+		Colors[EGDC_INACTIVE_CAPTION]=	0xffd2d2d2;
 		Colors[EGDC_TOOLTIP]		=	0xf00f2033;
 		Colors[EGDC_TOOLTIP_BACKGROUND]=0xc0cbd2d9;
 		Colors[EGDC_SCROLLBAR]		=	0xf0e0e0e0;