From d0d159d17d31831df664ec3a8d981e70efe10c68 Mon Sep 17 00:00:00 2001
From: Greg Ercolano <erco@seriss.com>
Date: Sun, 13 Feb 2011 17:30:17 +0000
Subject: [PATCH] Selection color fixes, widget screenshot added to top of
 docs.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8420 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Tree.H                      |   3 +++
 documentation/src/tree-simple.png | Bin 0 -> 2175 bytes
 src/Fl_Tree.cxx                   |   2 +-
 src/Fl_Tree_Item.cxx              |  12 ++++++------
 4 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 documentation/src/tree-simple.png

diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H
index c6ddfb5da..792ae4adf 100644
--- a/FL/Fl_Tree.H
+++ b/FL/Fl_Tree.H
@@ -45,6 +45,9 @@
 ///
 /// \brief Tree widget.
 ///
+///     \image html tree-simple.png "Fl_Tree example program"
+///     \image latex tree-simple.png "Fl_Tree example program" width=4cm
+///
 /// \code
 ///     Fl_Tree                                         // Top level widget
 ///        |--- Fl_Tree_Item                            // Items in the tree
diff --git a/documentation/src/tree-simple.png b/documentation/src/tree-simple.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b921514ed3787e527ac91f272a2cb714c317ffa
GIT binary patch
literal 2175
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

literal 0
HcmV?d00001

diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx
index fe3a8e267..03d3ccdff 100644
--- a/src/Fl_Tree.cxx
+++ b/src/Fl_Tree.cxx
@@ -93,7 +93,7 @@ Fl_Tree::Fl_Tree(int X, int Y, int W, int H, const char *L) : Fl_Group(X,Y,W,H,L
   _callback_reason = FL_TREE_REASON_NONE;
   _scrollbar_size  = 0;				// 0: uses Fl::scrollbar_size()
   box(FL_DOWN_BOX);
-  color(FL_WHITE);
+  color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
   when(FL_WHEN_CHANGED);
   _vscroll = new Fl_Scrollbar(0,0,0,0);		// will be resized by draw()
   _vscroll->hide();
diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx
index 329c0ef33..053f0adb7 100644
--- a/src/Fl_Tree_Item.cxx
+++ b/src/Fl_Tree_Item.cxx
@@ -562,12 +562,12 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
     W += prefs.openicon()->w();
   }
   // Colors, fonts
-  Fl_Color fg = _selected ? _labelbgcolor : _labelfgcolor;		// selected uses bgcolor, unselected uses fgcolor
-  Fl_Color bg = _selected ? tree->selection_color() : _labelbgcolor;	// selected uses selectcolor, unselected uses bgcolor
-  if ( ! _active ) {
-    fg = fl_inactive(fg);
-    if ( _selected ) bg = fl_inactive(bg);
-  }
+  Fl_Color fg = _selected ? fl_contrast(_labelfgcolor, tree->selection_color())
+                          : _active ? _labelfgcolor 
+			            : fl_inactive(_labelfgcolor);
+  Fl_Color bg = _selected ? _active ? tree->selection_color() 
+                                    : fl_inactive(tree->selection_color())
+                          : _labelbgcolor;
   // Update the xywh of this item
   _xywh[0] = X;
   _xywh[1] = Y;