Merge branch 'hotfix-1.6.2' into develop-1.7

2018-12-29 07:18:03 +08:00
parent ce1b143b59 345d65f6c9
commit 88294ed9fb
10 changed files with 71 additions and 22 deletions
--- a/source/gui/widgets/skeletons/text_editor.cpp
+++ b/source/gui/widgets/skeletons/text_editor.cpp
@@ -2002,7 +2002,7 @@ namespace nana {

 				auto fgcolor = scheme_->foreground.get_color();
 				if (!API::window_enabled(window_))
-					fgcolor.blend(bgcolor, 0.5);
+					fgcolor = fgcolor.blend(bgcolor, 0.5); //Thank to besh81 for getting the fgcolor to be changed

 				if (API::widget_borderless(window_))
 					graph_.rectangle(false, bgcolor);