mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better Fl_Tabs callback handling.

Browse Source
This commit is contained in:
Matthias Melcher 2024-08-03 13:05:26 +02:00
parent abb2971654
commit 97b1df805e
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Tabs.H
View File

@ -252,7 +252,7 @@ protected:
int has_overflow_menu;///< set in OVERFLOW_PULLDOWN mode if tabs overflow. The actual menu array is created only on demand int has_overflow_menu;///< set in OVERFLOW_PULLDOWN mode if tabs overflow. The actual menu array is created only on demand
void take_focus(Fl_Widget *o); void take_focus(Fl_Widget *o);
void maybe_do_callback(Fl_Widget *o); int maybe_do_callback(Fl_Widget *o);
void check_overflow_menu(); void check_overflow_menu();
void handle_overflow_menu(); void handle_overflow_menu();
void draw_overflow_menu_button(); void draw_overflow_menu_button();

31
src/Fl_Tabs.cxx
View File

@ -388,19 +388,28 @@ void Fl_Tabs::take_focus(Fl_Widget *o) {
/** /**
Set tab o as selected an call callbacks if needed. Set tab o as selected an call callbacks if needed.
\param[in] o the newly selected tab \param[in] o the newly selected tab
\return 0 if o is invalide or was deleted by the callback and must no longer be used
*/ */
void Fl_Tabs::maybe_do_callback(Fl_Widget *o) { int Fl_Tabs::maybe_do_callback(Fl_Widget *o) {
if (o && // Released on a tab and.. // chaeck if o is valid
(value(o) || // tab changed value or.. if ( o == NULL )
(when()&(FL_WHEN_NOT_CHANGED)) // ..no change but WHEN_NOT_CHANGED set, return 0;
) // handles FL_WHEN_RELEASE_ALWAYS too.
) { // set the new tab value
Fl_Widget_Tracker wp(o); int tab_changed = value(o);
if ( tab_changed )
set_changed(); set_changed();
do_callback(FL_REASON_SELECTED);
if (wp.deleted()) return; // do we need to call the callback?
if ( tab_changed || ( when() & (FL_WHEN_NOT_CHANGED) ) ) {
Fl_Widget_Tracker wp(o); // we want to know if the widget lives on
do_callback(FL_REASON_SELECTED); // this may delete the tab
if (wp.deleted()) return 0; // if it did, return 0
} }
return;
// if o is still valid, do remaining tasks
Fl_Tooltip::current(o);
return 1;
} }
/** /**
@ -448,7 +457,6 @@ void Fl_Tabs::handle_overflow_menu() {
push(0); push(0);
take_focus(o); take_focus(o);
maybe_do_callback(o); maybe_do_callback(o);
Fl_Tooltip::current(o);
} }
// delete the menu until we need it next time // delete the menu until we need it next time
@ -572,7 +580,6 @@ int Fl_Tabs::handle(int event) {
return 1; // o may be deleted at this point return 1; // o may be deleted at this point
} }
maybe_do_callback(o); maybe_do_callback(o);
Fl_Tooltip::current(o);
} else { } else {
push(o); push(o);
} }