gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds Fl_Menu_::prev_mvalue() (#685)

Browse Source
This commit is contained in:
Matthias Melcher 2023-09-29 15:22:47 +02:00
parent 25a9af2f06
commit 144d7d3529
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FL/Fl_Menu_.H
View File

@ -54,6 +54,7 @@ class FL_EXPORT Fl_Menu_ : public Fl_Widget {
Fl_Menu_Item *menu_;
const Fl_Menu_Item *value_;
const Fl_Menu_Item *prev_value_;
protected:
@ -158,6 +159,10 @@ public:
/** Returns a pointer to the last menu item that was picked. */
const Fl_Menu_Item *mvalue() const {return value_;}
/** Returns a pointer to the menu item that was picked before the current one was picked.
This call gives devs additional details how a user changed a choice in the Fl_Choice widget.
*/
const Fl_Menu_Item *prev_mvalue() const {return prev_value_;}
/** Returns the index into menu() of the last item chosen by the user. It is zero initially. */
int value() const {return value_ ? (int)(value_-menu_) : -1;}
int value(const Fl_Menu_Item*);

12
src/Fl_Menu_.cxx
View File

@ -308,7 +308,11 @@ const Fl_Menu_Item* Fl_Menu_::find_item_with_argument(long v) {
*/
int Fl_Menu_::value(const Fl_Menu_Item* m) {
clear_changed();
if (value_ != m) {value_ = m; return 1;}
if (value_ != m) {
prev_value_ = value_;
value_ = m;
return 1;
}
return 0;
}
@ -332,6 +336,7 @@ const Fl_Menu_Item* Fl_Menu_::picked(const Fl_Menu_Item* v) {
} else if (v != value_) { // normal item
set_changed();
}
prev_value_ = value_;
value_ = v;
if (when()&(FL_WHEN_CHANGED|FL_WHEN_RELEASE)) {
if (changed() || when()&FL_WHEN_NOT_CHANGED) {
@ -422,7 +427,7 @@ Fl_Menu_::Fl_Menu_(int X,int Y,int W,int H,const char* l)
set_flag(SHORTCUT_LABEL);
box(FL_UP_BOX);
when(FL_WHEN_RELEASE_ALWAYS);
value_ = menu_ = 0;
value_ = prev_value_ = menu_ = 0;
alloc = 0;
selection_color(FL_SELECTION_COLOR);
textfont(FL_HELVETICA);
@ -451,6 +456,7 @@ int Fl_Menu_::size() const {
*/
void Fl_Menu_::menu(const Fl_Menu_Item* m) {
clear();
prev_value_ = NULL;
value_ = menu_ = (Fl_Menu_Item*)m;
}
@ -499,7 +505,7 @@ void Fl_Menu_::clear() {
alloc = 0;
}
menu_ = 0;
value_ = 0;
value_ = prev_value_ = 0;
}
/**