Add close buttons for individual tabs in Fl_Tabs (#628)

Add close buttons for Fl_Tabs
Introducing callback reasons
FLUID shows all FL_WHEN_... options
Adding Fl_Tabs overflow types
Improved test/tabs to show new features

1 files changed, 46 insertions, 13 deletions

diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index cab346b5d..08396e85c 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1110,12 +1110,20 @@ void down_box_cb(Fl_Choice* i, void *v) {
 ////////////////////////////////////////////////////////////////
 
 Fl_Menu_Item whenmenu[] = {
+  // set individual bits
   {"FL_WHEN_CHANGED",0,0,(void*)FL_WHEN_CHANGED, FL_MENU_TOGGLE},
   {"FL_WHEN_NOT_CHANGED",0,0,(void*)FL_WHEN_NOT_CHANGED, FL_MENU_TOGGLE},
   {"FL_WHEN_RELEASE",0,0,(void*)FL_WHEN_RELEASE, FL_MENU_TOGGLE},
   {"FL_WHEN_ENTER_KEY",0,0,(void*)FL_WHEN_ENTER_KEY, FL_MENU_TOGGLE},
+  {"FL_WHEN_CLOSED",0,0,(void*)FL_WHEN_CLOSED, FL_MENU_TOGGLE|FL_MENU_DIVIDER},
+  // set bit combinations
+  {"FL_WHEN_NEVER",0,0,(void*)FL_WHEN_NEVER},
+  {"FL_WHEN_RELEASE_ALWAYS",0,0,(void*)FL_WHEN_RELEASE_ALWAYS},
+  {"FL_WHEN_ENTER_KEY_ALWAYS",0,0,(void*)FL_WHEN_ENTER_KEY_ALWAYS},
+  {"FL_WHEN_ENTER_KEY_CHANGED",0,0,(void*)FL_WHEN_ENTER_KEY_CHANGED},
   {0}};
 
+
 static Fl_Menu_Item whensymbolmenu[] = {
   /*  0 */ {"FL_WHEN_NEVER",0,0,(void*)FL_WHEN_NEVER},
   /*  1 */ {"FL_WHEN_CHANGED",0,0,(void*)FL_WHEN_CHANGED},
@@ -1136,23 +1144,48 @@ static Fl_Menu_Item whensymbolmenu[] = {
   {0}
 };
 
+// Return a text string representing  the Fl_When value n
+const char* when_symbol_name(int n) {
+  static char sym[128];
+  if (n == FL_WHEN_CLOSED) {
+    strcpy(sym, "FL_WHEN_CLOSED");
+  } else {
+    strcpy(sym, whensymbolmenu[n&15].label());
+    if (n & FL_WHEN_CLOSED)
+      strcat(sym, " | FL_WHEN_CLOSED");
+  }
+  return sym;
+}
+
+// Set the check marks in the "when()" menu according to the Fl_When value n
+void set_whenmenu(int n) {
+  if (n&FL_WHEN_CHANGED)      whenmenu[0].set(); else whenmenu[0].clear();
+  if (n&FL_WHEN_NOT_CHANGED)  whenmenu[1].set(); else whenmenu[1].clear();
+  if (n&FL_WHEN_RELEASE)      whenmenu[2].set(); else whenmenu[2].clear();
+  if (n&FL_WHEN_ENTER_KEY)    whenmenu[3].set(); else whenmenu[3].clear();
+  if (n&FL_WHEN_CLOSED)       whenmenu[4].set(); else whenmenu[4].clear();
+}
+
 void when_cb(Fl_Menu_Button* i, void *v) {
   if (v == LOAD) {
     if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
-    int n = current_widget->o->when() & 15;
-    if (n&1) whenmenu[0].set(); else whenmenu[0].clear();
-    if (n&2) whenmenu[1].set(); else whenmenu[1].clear();
-    if (n&4) whenmenu[2].set(); else whenmenu[2].clear();
-    if (n&8) whenmenu[3].set(); else whenmenu[3].clear();
-    w_when_box->label(whensymbolmenu[n].label());
+    int n = current_widget->o->when();
+    set_whenmenu(n);
+    w_when_box->copy_label(when_symbol_name(n));
   } else {
     int mod = 0;
     int n = 0;
-    if (whenmenu[0].value()) n |= 1;
-    if (whenmenu[1].value()) n |= 2;
-    if (whenmenu[2].value()) n |= 4;
-    if (whenmenu[3].value()) n |= 8;
-    w_when_box->label(whensymbolmenu[n].label());
+    if (i->mvalue() && ((i->mvalue()->flags & FL_MENU_TOGGLE) == 0) ) {
+      n = (int)i->mvalue()->argument();
+      set_whenmenu(n);
+    } else {
+      if (whenmenu[0].value()) n |= FL_WHEN_CHANGED;
+      if (whenmenu[1].value()) n |= FL_WHEN_NOT_CHANGED;
+      if (whenmenu[2].value()) n |= FL_WHEN_RELEASE;
+      if (whenmenu[3].value()) n |= FL_WHEN_ENTER_KEY;
+      if (whenmenu[4].value()) n |= FL_WHEN_CLOSED;
+    }
+    w_when_box->copy_label(when_symbol_name(n));
     for (Fl_Type *o = Fl_Type::first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         Fl_Widget_Type* q = (Fl_Widget_Type*)o;
@@ -3074,8 +3107,7 @@ void Fl_Widget_Type::write_widget_code() {
   if (ww==FL_WHEN_NOT_CHANGED)
     ww = FL_WHEN_NEVER;
   if (ww != tplate->when() || subclass())
-    write_c("%s%s->when(%s);\n", indent(), var,
-            item_name(whensymbolmenu, ww));
+    write_c("%s%s->when(%s);\n", indent(), var, when_symbol_name(ww));
   if (!o->visible() && o->parent())
     write_c("%s%s->hide();\n", indent(), var);
   if (!o->active())
@@ -3552,6 +3584,7 @@ void Fl_Widget_Type::copy_properties() {
   w->labelsize(o->labelsize());
   w->labelcolor(o->labelcolor());
   w->align(o->align());
+  w->when(o->when());
 
   // copy all attributes specific to widgets derived from Fl_Button
   if (is_button()) {