diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-03-17 09:38:20 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-03-17 09:38:20 +0000 |
| commit | ca15addad29e97d06a477895877e72b301a0529c (patch) | |
| tree | 766ec3a16626a5f5d600385ad356979940dc7b27 /src/Fl_Browser_.cxx | |
| parent | 22418bb1e90b7c1b1d98ef56b03ae836fa63c46c (diff) | |
Fixed up the colors the browser draws when it is deactivated, it does not
change the background color, this fixes Jeff Meininger's demo.
Fl_Input allows ^I, ^J, ^L, and ^M to be typed as control characters and
inserted.
If you type ^H or ^? they act like backspace and delete.
Clicking on an input field no longer selects the whole thing, it inserts
the cursor. My tests of Win32 to see what they did were wrong, this is
a better simulation and more user friendly, too.
Fixed divide-by-zer in the slider code?
Better osf code for filename_list from Alexander Mai
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Browser_.cxx')
| -rw-r--r-- | src/Fl_Browser_.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx index 93d87080b..d57ed6df3 100644 --- a/src/Fl_Browser_.cxx +++ b/src/Fl_Browser_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser_.cxx,v 1.10.2.9 2000/03/15 19:14:57 mike Exp $" +// "$Id: Fl_Browser_.cxx,v 1.10.2.10 2000/03/17 09:38:18 bill Exp $" // // Base Browser widget class for the Fast Light Tool Kit (FLTK). // @@ -311,15 +311,14 @@ J1: fl_color(active_r() ? selection_color() : inactive(selection_color())); fl_rectf(X, yy+Y, W, hh); } else if (!(damage()&FL_DAMAGE_ALL)) { - fl_color(active_r() ? color() : inactive(color())); + fl_color(color()); fl_rectf(X, yy+Y, W, hh); } - if (type() == FL_MULTI_BROWSER && l == selection_) { + item_draw(l, X-hposition_, yy+Y, W+hposition_, hh); + if (l == selection_) { fl_color(active_r() ? textcolor() : inactive(textcolor())); fl_rect(X+1, yy+Y, W-2, hh); } - item_draw(l, X-hposition_, yy+Y, W+hposition_, hh); - if (l == selection_) fl_rect(X, yy+Y, W, hh); int w = item_width(l); if (w > max_width) {max_width = w; max_width_item = l;} } @@ -327,7 +326,7 @@ J1: } // erase the area below last line: if (!(damage()&FL_DAMAGE_ALL) && yy < H) { - fl_color(active_r() ? color() : inactive(color())); + fl_color(color()); fl_rectf(X, yy+Y, W, H-yy); } fl_pop_clip(); @@ -701,5 +700,5 @@ void Fl_Browser_::item_select(void*, int) {} int Fl_Browser_::item_selected(void* l) const {return l==selection_;} // -// End of "$Id: Fl_Browser_.cxx,v 1.10.2.9 2000/03/15 19:14:57 mike Exp $". +// End of "$Id: Fl_Browser_.cxx,v 1.10.2.10 2000/03/17 09:38:18 bill Exp $". // |