FLUID: more Fl_Grid settings

1 files changed, 45 insertions, 29 deletions

diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 6c3b199e4..0fa9caafd 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -874,7 +874,7 @@ wCallback->do_callback(wCallback, v);} open
         }
       }
     }
-    Fl_Tabs widget_tabs_repo {selected
+    Fl_Tabs widget_tabs_repo {open
       xywh {10 10 400 350} hide
       code0 {o->hide();}
     } {
@@ -886,26 +886,30 @@ wCallback->do_callback(wCallback, v);} open
         callback propagate_load open
         xywh {10 30 400 330} labelsize 11
       } {
+        Fl_Box {} {
+          label {The Fl_Grid implementation in FLUID is still experimental!}
+          xywh {25 43 370 28} labelfont 1 labelsize 11 labelcolor 1
+        }
         Fl_Group {} {
           label {Location:}
           callback propagate_load open
           xywh {96 110 314 20} labelfont 1 labelsize 11 align 4
         } {
-          Fl_Input {} {
+          Fl_Input widget_grid_row_input {
             label {Row:}
             callback grid_set_row_cb
             xywh {96 110 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
-          Fl_Input {} {
+          Fl_Input widget_grid_col_input {
             label {Column:}
-            callback grid_set_col_cb
+            callback grid_set_col_cb selected
             xywh {156 110 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Choice {} {
             label {Align:}
-            callback grid_align_cb
+            callback grid_align_cb open
             xywh {215 110 185 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
           } {
             MenuItem {} {
@@ -919,11 +923,6 @@ wCallback->do_callback(wCallback, v);} open
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
-              label GRID_PROPORTIONAL
-              user_data FL_GRID_PROPORTIONAL user_data_type long
-              xywh {10 10 31 20} labelsize 11
-            }
-            MenuItem {} {
               label GRID_HORIZONTAL
               user_data FL_GRID_HORIZONTAL user_data_type long
               xywh {10 10 31 20} labelsize 11
@@ -983,7 +982,7 @@ wCallback->do_callback(wCallback, v);} open
           xywh {96 74 155 20} labelfont 1 labelsize 12 align 20
         }
         Fl_Group {} {
-          label {Size:}
+          label {Cell Span:}
           callback propagate_load open
           xywh {96 145 314 20} labelfont 1 labelsize 11 align 4
         } {
@@ -1003,81 +1002,98 @@ wCallback->do_callback(wCallback, v);} open
             class Fluid_Coord_Input
           }
         }
+        Fl_Group {} {
+          label {Size:}
+          callback propagate_load open
+          xywh {96 180 314 20} labelfont 1 labelsize 11 align 4
+        } {
+          Fl_Box {} {
+            xywh {400 180 1 20} hide resizable
+          }
+          Fl_Input {} {
+            label {Min.Width:}
+            callback grid_set_min_wdt_cb
+            xywh {96 180 55 20} labelsize 11 align 5 textsize 11
+            class Fluid_Coord_Input
+          }
+          Fl_Input {} {
+            label {Min.Height:}
+            callback grid_set_min_hgt_cb
+            xywh {156 180 55 20} labelsize 11 align 5 textsize 11
+            class Fluid_Coord_Input
+          }
+        }
         Fl_Box {} {
           label {-- Grid --}
-          xywh {96 179 155 20} labelfont 1 labelsize 12 align 20
+          xywh {96 214 155 20} labelfont 1 labelsize 12 align 20
         }
         Fl_Group {} {
           label {Row:}
           callback propagate_load open
-          xywh {96 215 314 20} labelfont 1 labelsize 11 align 4
+          xywh {96 250 314 20} labelfont 1 labelsize 11 align 4
         } {
           Fl_Input {} {
             label Index
-            xywh {96 215 55 20} labelsize 11 align 5 textsize 11 deactivate
+            xywh {96 250 55 20} labelsize 11 align 5 textsize 11 deactivate
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Height:}
             callback grid_row_height
-            xywh {156 215 55 20} labelsize 11 align 5 textsize 11
+            xywh {156 250 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Weight:}
             callback grid_row_weight
-            xywh {216 215 55 20} labelsize 11 align 5 textsize 11
+            xywh {216 250 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Gap:}
             callback grid_row_gap
-            xywh {276 215 55 20} labelsize 11 align 5 textsize 11
+            xywh {276 250 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Box {} {
-            xywh {400 215 1 20} hide resizable
+            xywh {400 250 1 20} hide resizable
           }
         }
         Fl_Group {} {
           label {Column:}
           callback propagate_load open
-          xywh {96 250 314 20} labelfont 1 labelsize 11 align 4
+          xywh {96 285 314 20} labelfont 1 labelsize 11 align 4
         } {
           Fl_Input {} {
             label Index
-            xywh {96 250 55 20} labelsize 11 align 5 textsize 11 deactivate
+            xywh {96 285 55 20} labelsize 11 align 5 textsize 11 deactivate
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Width:}
             callback grid_col_width
-            xywh {156 250 55 20} labelsize 11 align 5 textsize 11
+            xywh {156 285 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Weight:}
             callback grid_col_weight
-            xywh {216 250 55 20} labelsize 11 align 5 textsize 11
+            xywh {216 285 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Input {} {
             label {Gap:}
             callback grid_col_gap
-            xywh {276 250 55 20} labelsize 11 align 5 textsize 11
+            xywh {276 285 55 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
           Fl_Box {} {
-            xywh {400 250 1 20} hide resizable
+            xywh {400 285 1 20} hide resizable
           }
         }
-        Fl_Box {} {
-          label {The Fl_Grid implementation in FLUID is still experimental!}
-          xywh {25 43 370 28} labelfont 1 labelsize 11 labelcolor 1
-        }
       }
     }
-    Fl_Group {} {open
+    Fl_Group {} {
       xywh {10 370 400 20} labelsize 11
     } {
       Fl_Button wLiveMode {