From 6a143b1f61533c03ef20a8f2b82d2c90180055bc Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 22 Apr 2008 18:11:51 +0000 Subject: Applying 1.1.9 changes to the 1.3 branch. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6108 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Text_Display.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Fl_Text_Display.cxx') diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 2fa424711..5ae5f6ff2 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1664,19 +1664,19 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, if (style & PRIMARY_MASK) { if (Fl::focus() == this) background = selection_color(); - else background = fl_color_average(color(), selection_color(), 0.5f); + else background = fl_color_average(color(), selection_color(), 0.4f); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.8f); - else background = fl_color_average(color(), selection_color(), 0.9f); + if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + else background = fl_color_average(color(), selection_color(), 0.6f); } else background = color(); foreground = fl_contrast(styleRec->color, background); } else if (style & PRIMARY_MASK) { if (Fl::focus() == this) background = selection_color(); - else background = fl_color_average(color(), selection_color(), 0.5f); + else background = fl_color_average(color(), selection_color(), 0.4f); foreground = fl_contrast(textcolor(), background); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.8f); - else background = fl_color_average(color(), selection_color(), 0.9f); + if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + else background = fl_color_average(color(), selection_color(), 0.6f); foreground = fl_contrast(textcolor(), background); } else { foreground = textcolor(); @@ -1727,13 +1727,13 @@ void Fl_Text_Display::clear_rect( int style, int X, int Y, if (Fl::focus()==this) { fl_color(selection_color()); } else { - fl_color(fl_color_average(color(), selection_color(), 0.5f)); + fl_color(fl_color_average(color(), selection_color(), 0.4f)); } } else if (style & HIGHLIGHT_MASK) { if (Fl::focus()==this) { - fl_color(fl_color_average(color(), selection_color(), 0.8f)); + fl_color(fl_color_average(color(), selection_color(), 0.5f)); } else { - fl_color(fl_color_average(color(), selection_color(), 0.9f)); + fl_color(fl_color_average(color(), selection_color(), 0.6f)); } } else { fl_color( color() ); -- cgit v1.2.3