FLUID: Moves grid settings into dynamic tab

1 files changed, 9 insertions, 12 deletions

diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index f1e7e5170..ad46187e3 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -2237,17 +2237,6 @@ void flex_margin_group_cb(Fl_Group* g, void* v) {
   }
 }
 
-void grid_margin_group_cb(Fl_Group* g, void* v) {
-  if (v == LOAD) {
-    if (current_widget->is_a(ID_Grid)) {
-      g->show();
-    } else {
-      g->hide();
-    }
-    propagate_load(g, v);
-  }
-}
-
 void size_range_group_cb(Fl_Group* g, void* v) {
   if (v == LOAD) {
     if (current_widget->is_a(ID_Window)) {
@@ -2658,7 +2647,7 @@ static void load_panel() {
       }
     }
   }
-  if (current_widget && current_widget->parent->is_a(ID_Grid)) {
+  if (current_widget && current_widget->is_a(ID_Grid)) {
     if (widget_tab_grid->parent()!=widget_tabs)
       widget_tabs->add(widget_tab_grid);
   } else {
@@ -2666,6 +2655,14 @@ static void load_panel() {
       widget_tabs_repo->add(widget_tab_grid);
     }
   }
+  if (current_widget && current_widget->parent && current_widget->parent->is_a(ID_Grid)) {
+    if (widget_tab_grid_child->parent()!=widget_tabs)
+      widget_tabs->add(widget_tab_grid_child);
+  } else {
+    if (widget_tab_grid_child->parent()==widget_tabs) {
+      widget_tabs_repo->add(widget_tab_grid_child);
+    }
+  }
   if (numselected)
     propagate_load(the_panel, LOAD);
   else