diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Fl_Group.cxx | 24 | ||||
| -rw-r--r-- | src/Fl_Input_Choice.cxx | 220 | ||||
| -rw-r--r-- | src/Makefile | 1 |
4 files changed, 223 insertions, 23 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0aac7cb1d..215aa7fcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,6 +32,7 @@ set (CPPFILES Fl_Image_Surface.cxx Fl_Input.cxx Fl_Input_.cxx + Fl_Input_Choice.cxx Fl_Light_Button.cxx Fl_Menu.cxx Fl_Menu_.cxx diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx index 5a8fb1fd4..769156540 100644 --- a/src/Fl_Group.cxx +++ b/src/Fl_Group.cxx @@ -3,7 +3,7 @@ // // Group widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2017 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -28,10 +28,6 @@ #include <FL/fl_draw.H> #include <stdlib.h> -#include <FL/Fl_Input_Choice.H> -#include <FL/Fl_Spinner.H> - - Fl_Group* Fl_Group::current_; // Hack: A single child is stored in the pointer to the array, while @@ -834,24 +830,6 @@ void Fl_Group::draw_outside_label(const Fl_Widget& widget) const { } -Fl_Input_Choice::Fl_Input_Choice (int X,int Y,int W,int H,const char*L) -: Fl_Group(X,Y,W,H,L) -{ - Fl_Group::box(FL_DOWN_BOX); - align(FL_ALIGN_LEFT); // default like Fl_Input - inp_ = new Fl_Input(inp_x(), inp_y(), - inp_w(), inp_h()); - inp_->callback(inp_cb, (void*)this); - inp_->box(FL_FLAT_BOX); // cosmetic - inp_->when(FL_WHEN_CHANGED|FL_WHEN_NOT_CHANGED); - menu_ = new InputMenuButton(menu_x(), menu_y(), - menu_w(), menu_h()); - menu_->callback(menu_cb, (void*)this); - menu_->box(FL_FLAT_BOX); // cosmetic - end(); -} - - // // End of "$Id$". // diff --git a/src/Fl_Input_Choice.cxx b/src/Fl_Input_Choice.cxx new file mode 100644 index 000000000..0735d869d --- /dev/null +++ b/src/Fl_Input_Choice.cxx @@ -0,0 +1,220 @@ +// +// "$Id$" +// +// An input/chooser widget. +// ______________ ____ +// | || __ | +// | input area || \/ | +// |______________||____| +// +// Copyright 1998-2017 by Bill Spitzak and others. +// Copyright 2004 by Greg Ercolano. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +/* \file + Fl_Input_Choice widget . */ + +#include <FL/Fl_Input_Choice.H> + +#include <FL/fl_draw.H> +#include <string.h> + +/** + \class Fl_Input_Choice + + \brief A combination of the input widget and a menu button. + + \image html input_choice.jpg + \image latex input_choice.jpg "Fl_Input_Choice widget" width=6cm + + The user can either type into the input area, or use the + menu button chooser on the right to choose an item which loads + the input area with the selected text. + + The application can directly access both the internal Fl_Input + and Fl_Menu_Button widgets respectively using the input() and menubutton() + accessor methods. + + The default behavior is to invoke the Fl_Input_Choice::callback() + if the user changes the input field's contents, either by typing, + pasting, or clicking a different item in the choice menu. + + The callback can determine if an item was picked vs. typing + into the input field by checking the value of menubutton()->changed(), + which will be: + + - 1: the user picked a different item in the choice menu + - 0: the user typed or pasted directly into the input field + + Example use: + \code + #include <stdio.h> + #include <FL/Fl.H> + #include <FL/Fl_Double_Window.H> + #include <FL/Fl_Input_Choice.H> + void choice_cb(Fl_Widget *w, void *userdata) { + // Show info about the picked item + Fl_Input_Choice *choice = (Fl_Input_Choice*)w; + const Fl_Menu_Item *item = choice->menubutton()->mvalue(); + printf("*** Choice Callback:\n"); + printf(" item label()='%s'\n", item ? item->label() : "(No item)"); + printf(" item value()=%d\n", choice->menubutton()->value()); + printf(" input value()='%s'\n", choice->input()->value()); + printf(" The user %s\n", choice->menubutton()->changed() + ? "picked a menu item" + : "typed text"); + } + int main() { + Fl_Double_Window win(200,100,"Input Choice"); + win.begin(); + Fl_Input_Choice choice(10,10,100,30); + choice.callback(choice_cb, 0); + choice.add("Red"); + choice.add("Orange"); + choice.add("Yellow"); + //choice.value("Red"); // uncomment to make "Red" default + win.end(); + win.show(); + return Fl::run(); + } + \endcode +*/ + +/** Constructor for private menu button. */ + +Fl_Input_Choice::InputMenuButton::InputMenuButton(int x,int y,int w,int h,const char*l) + :Fl_Menu_Button(x,y,w,h,l) +{ + box(FL_UP_BOX); +}; + +/** Draws the private menu button. */ + +void Fl_Input_Choice::InputMenuButton::draw() { + draw_box(FL_UP_BOX, color()); + fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor())); + int xc = x()+w()/2, yc=y()+h()/2; + fl_polygon(xc-5,yc-3,xc+5,yc-3,xc,yc+3); + if (Fl::focus() == this) draw_focus(); +} + + +/** Callback for the Fl_Input_Choice menu. */ + +void Fl_Input_Choice::menu_cb(Fl_Widget*, void *data) { + Fl_Input_Choice *o=(Fl_Input_Choice *)data; + Fl_Widget_Tracker wp(o); + const Fl_Menu_Item *item = o->menubutton()->mvalue(); + if (item && item->flags & (FL_SUBMENU|FL_SUBMENU_POINTER)) return; // ignore submenus + if (!strcmp(o->inp_->value(), o->menu_->text())) + { + o->Fl_Widget::clear_changed(); + if (o->when() & FL_WHEN_NOT_CHANGED) + o->do_callback(); + } + else + { + o->inp_->value(o->menu_->text()); + o->inp_->set_changed(); + o->Fl_Widget::set_changed(); + if (o->when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE)) + o->do_callback(); + } + + if (wp.deleted()) return; + + if (o->callback() != default_callback) + { + o->Fl_Widget::clear_changed(); + o->inp_->clear_changed(); + } +} + +/** Callback for the Fl_Input_Choice input field. */ + +void Fl_Input_Choice::inp_cb(Fl_Widget*, void *data) { + Fl_Input_Choice *o=(Fl_Input_Choice *)data; + Fl_Widget_Tracker wp(o); + if (o->inp_->changed()) { + o->Fl_Widget::set_changed(); + if (o->when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE)) + o->do_callback(); + } else { + o->Fl_Widget::clear_changed(); + if (o->when() & FL_WHEN_NOT_CHANGED) + o->do_callback(); + } + + if (wp.deleted()) return; + + if (o->callback() != default_callback) + o->Fl_Widget::clear_changed(); +} + +/** + Creates a new Fl_Input_Choice widget using the given position, size, + and label string. + + Inherited destructor destroys the widget and any values associated with it. +*/ +Fl_Input_Choice::Fl_Input_Choice (int X, int Y, int W, int H, const char *L) +: Fl_Group(X,Y,W,H,L) { + Fl_Group::box(FL_DOWN_BOX); + align(FL_ALIGN_LEFT); // default like Fl_Input + inp_ = new Fl_Input(inp_x(), inp_y(), + inp_w(), inp_h()); + inp_->callback(inp_cb, (void*)this); + inp_->box(FL_FLAT_BOX); // cosmetic + inp_->when(FL_WHEN_CHANGED|FL_WHEN_NOT_CHANGED); + menu_ = new InputMenuButton(menu_x(), menu_y(), + menu_w(), menu_h()); + menu_->callback(menu_cb, (void*)this); + menu_->box(FL_FLAT_BOX); // cosmetic + end(); +} + +/** Resizes the Fl_Input_Choice widget. +*/ +void Fl_Input_Choice::resize(int X, int Y, int W, int H) { + Fl_Group::resize(X,Y,W,H); + inp_->resize(inp_x(), inp_y(), inp_w(), inp_h()); + menu_->resize(menu_x(), menu_y(), menu_w(), menu_h()); +} + +/** Chooses item# \p val in the menu, and sets the Fl_Input text field + to that value. Any previous text is cleared. + \see void value(const char *val) +*/ +void Fl_Input_Choice::value(int val) { + menu_->value(val); + inp_->value(menu_->text(val)); +} + +/** Sets the changed() state of both input and menu button widgets + to the specified value. +*/ +void Fl_Input_Choice::set_changed() { + inp_->set_changed(); + // no need to call Fl_Widget::set_changed() +} + +/** Clears the changed() state of both input and menu button widgets. */ +void Fl_Input_Choice::clear_changed() { + inp_->clear_changed(); + Fl_Widget::clear_changed(); +} + + +// +// End of "$Id$". +// diff --git a/src/Makefile b/src/Makefile index cecae2845..52ff8ff5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -51,6 +51,7 @@ CPPFILES = \ Fl_Image_Surface.cxx \ Fl_Input.cxx \ Fl_Input_.cxx \ + Fl_Input_Choice.cxx \ Fl_Light_Button.cxx \ Fl_Menu.cxx \ Fl_Menu_.cxx \ |