Fixes for STR#3085; fluid UI layout clipping issues.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10149 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

11 files changed, 116 insertions, 109 deletions

diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 50e6b2381..b9d8cffbd 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #include "alignment_panel.h"
 #include <FL/Fl_Preferences.H>
@@ -64,10 +64,10 @@ Fl_Double_Window* make_project_window() {
       o->selection_color((Fl_Color)12);
       { Fl_Group* o = new Fl_Group(10, 36, 378, 169, "Output");
         o->hide();
-        { Fl_Box* o = new Fl_Box(100, 49, 236, 49, "Use \"name.ext\" to set a file name or just \".ext\" to set extension.");
-          o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE));
+        { Fl_Box* o = new Fl_Box(20, 49, 340, 49, "Use \"name.ext\" to set a file name or just \".ext\" to set extension.");
+          o->align(Fl_Align(132|FL_ALIGN_INSIDE));
         } // Fl_Box* o
-        { header_file_input = new Fl_Input(99, 103, 272, 20, "Header File:");
+        { header_file_input = new Fl_Input(119, 103, 252, 20, "Header File:");
           header_file_input->tooltip("The name of the generated header file.");
           header_file_input->box(FL_THIN_DOWN_BOX);
           header_file_input->labelfont(1);
@@ -75,7 +75,7 @@ Fl_Double_Window* make_project_window() {
           header_file_input->callback((Fl_Callback*)header_input_cb, (void*)(1));
           header_file_input->when(FL_WHEN_CHANGED);
         } // Fl_Input* header_file_input
-        { code_file_input = new Fl_Input(100, 128, 272, 20, "Code File:");
+        { code_file_input = new Fl_Input(119, 128, 252, 20, "Code File:");
           code_file_input->tooltip("The name of the generated code file.");
           code_file_input->box(FL_THIN_DOWN_BOX);
           code_file_input->labelfont(1);
@@ -83,12 +83,12 @@ Fl_Double_Window* make_project_window() {
           code_file_input->callback((Fl_Callback*)code_input_cb, (void*)(1));
           code_file_input->when(FL_WHEN_CHANGED);
         } // Fl_Input* code_file_input
-        { include_H_from_C_button = new Fl_Check_Button(100, 153, 272, 20, "Include Header from Code");
+        { include_H_from_C_button = new Fl_Check_Button(117, 153, 272, 20, "Include Header from Code");
           include_H_from_C_button->tooltip("Include the header file from the code file.");
           include_H_from_C_button->down_box(FL_DOWN_BOX);
           include_H_from_C_button->callback((Fl_Callback*)include_H_from_C_button_cb);
         } // Fl_Check_Button* include_H_from_C_button
-        { use_FL_COMMAND_button = new Fl_Check_Button(100, 176, 272, 20, "Menu shortcuts use FL_COMMAND");
+        { use_FL_COMMAND_button = new Fl_Check_Button(117, 176, 272, 20, "Menu shortcuts use FL_COMMAND");
           use_FL_COMMAND_button->tooltip("Replace FL_CTRL with FL_COMMAND when generating menu shortcut code.");
           use_FL_COMMAND_button->down_box(FL_DOWN_BOX);
           use_FL_COMMAND_button->callback((Fl_Callback*)use_FL_COMMAND_button_cb);
@@ -202,8 +202,8 @@ static void cb_Close1(Fl_Button*, void*) {
 }
 
 Fl_Double_Window* make_settings_window() {
-  { settings_window = new Fl_Double_Window(339, 241, "GUI Settings");
-    { scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme: ");
+  { settings_window = new Fl_Double_Window(349, 241, "GUI Settings");
+    { scheme_choice = new Fl_Choice(140, 10, 115, 25, "Scheme: ");
       scheme_choice->down_box(FL_BORDER_BOX);
       scheme_choice->labelfont(1);
       scheme_choice->callback((Fl_Callback*)scheme_cb);
@@ -216,48 +216,53 @@ Fl_Double_Window* make_settings_window() {
     { Fl_Group* o = new Fl_Group(116, 43, 220, 126);
       o->labelfont(1);
       o->align(Fl_Align(FL_ALIGN_CENTER));
-      { Fl_Box* o = new Fl_Box(116, 43, 1, 25, "Options: ");
+      { Fl_Box* o = new Fl_Box(140, 43, 1, 25, "Options: ");
         o->labelfont(1);
         o->align(Fl_Align(FL_ALIGN_LEFT));
       } // Fl_Box* o
-      { tooltips_button = new Fl_Check_Button(116, 43, 113, 25, "Show Tooltips");
+      { tooltips_button = new Fl_Check_Button(138, 43, 113, 25, "Show Tooltips");
         tooltips_button->down_box(FL_DOWN_BOX);
+        tooltips_button->labelsize(12);
         tooltips_button->callback((Fl_Callback*)cb_tooltips_button);
         int b;
         fluid_prefs.get("show_tooltips", b, 1);
         tooltips_button->value(b);
         Fl_Tooltip::enable(b);
       } // Fl_Check_Button* tooltips_button
-      { completion_button = new Fl_Check_Button(116, 68, 186, 25, "Show Completion Dialogs");
+      { completion_button = new Fl_Check_Button(138, 68, 186, 25, "Show Completion Dialogs");
         completion_button->down_box(FL_DOWN_BOX);
+        completion_button->labelsize(12);
         completion_button->callback((Fl_Callback*)cb_completion_button);
         int b;
         fluid_prefs.get("show_completion_dialogs", b, 1);
         completion_button->value(b);
       } // Fl_Check_Button* completion_button
-      { openlast_button = new Fl_Check_Button(116, 93, 214, 25, "Open Previous File on Startup");
+      { openlast_button = new Fl_Check_Button(138, 93, 214, 25, "Open Previous File on Startup");
         openlast_button->down_box(FL_DOWN_BOX);
+        openlast_button->labelsize(12);
         openlast_button->callback((Fl_Callback*)cb_openlast_button);
         int b;
         fluid_prefs.get("open_previous_file", b, 0);
         openlast_button->value(b);
       } // Fl_Check_Button* openlast_button
-      { prevpos_button = new Fl_Check_Button(116, 118, 209, 25, "Remember Window Positions");
+      { prevpos_button = new Fl_Check_Button(138, 118, 209, 25, "Remember Window Positions");
         prevpos_button->down_box(FL_DOWN_BOX);
+        prevpos_button->labelsize(12);
         prevpos_button->callback((Fl_Callback*)cb_prevpos_button);
         int b;
         fluid_prefs.get("prev_window_pos", b, 1);
         prevpos_button->value(b);
       } // Fl_Check_Button* prevpos_button
-      { show_comments_button = new Fl_Check_Button(116, 143, 209, 25, "Show Comments in Browser");
+      { show_comments_button = new Fl_Check_Button(138, 143, 209, 25, "Show Comments in Browser");
         show_comments_button->down_box(FL_DOWN_BOX);
+        show_comments_button->labelsize(12);
         show_comments_button->callback((Fl_Callback*)cb_show_comments_button);
         fluid_prefs.get("show_comments", show_comments, 1);
         show_comments_button->value(show_comments);
       } // Fl_Check_Button* show_comments_button
       o->end();
     } // Fl_Group* o
-    { recent_spinner = new Fl_Spinner(115, 173, 40, 25, "# Recent Files: ");
+    { recent_spinner = new Fl_Spinner(140, 173, 40, 25, "# Recent Files: ");
       recent_spinner->labelfont(1);
       recent_spinner->callback((Fl_Callback*)cb_recent_spinner);
       recent_spinner->when(FL_WHEN_CHANGED);
@@ -266,7 +271,7 @@ Fl_Double_Window* make_settings_window() {
       recent_spinner->maximum(10);
       recent_spinner->value(c);
     } // Fl_Spinner* recent_spinner
-    { Fl_Button* o = new Fl_Button(266, 205, 64, 25, "Close");
+    { Fl_Button* o = new Fl_Button(276, 205, 64, 25, "Close");
       o->tooltip("Close this dialog.");
       o->callback((Fl_Callback*)cb_Close1);
     } // Fl_Button* o
@@ -388,8 +393,8 @@ static void cb_Close2(Fl_Button*, void*) {
 Fl_Round_Button *def_widget_size[6]={(Fl_Round_Button *)0};
 
 Fl_Double_Window* make_layout_window() {
-  { grid_window = new Fl_Double_Window(285, 245, "Layout Settings");
-    { Fl_Int_Input* o = horizontal_input = new Fl_Int_Input(106, 10, 50, 25, "x");
+  { grid_window = new Fl_Double_Window(310, 245, "Layout Settings");
+    { Fl_Int_Input* o = horizontal_input = new Fl_Int_Input(116, 10, 50, 25, "x");
       horizontal_input->tooltip("Horizontal grid spacing.");
       horizontal_input->type(2);
       horizontal_input->box(FL_THIN_DOWN_BOX);
@@ -397,7 +402,7 @@ Fl_Double_Window* make_layout_window() {
       horizontal_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Int_Input* horizontal_input
-    { Fl_Int_Input* o = vertical_input = new Fl_Int_Input(166, 10, 50, 25, "pixels");
+    { Fl_Int_Input* o = vertical_input = new Fl_Int_Input(179, 10, 50, 25, "pixels");
       vertical_input->tooltip("Vertical grid spacing.");
       vertical_input->type(2);
       vertical_input->box(FL_THIN_DOWN_BOX);
@@ -405,7 +410,7 @@ Fl_Double_Window* make_layout_window() {
       vertical_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Int_Input* vertical_input
-    { Fl_Int_Input* o = snap_input = new Fl_Int_Input(106, 45, 50, 25, "pixel snap");
+    { Fl_Int_Input* o = snap_input = new Fl_Int_Input(116, 45, 50, 25, "pixel snap");
       snap_input->tooltip("Snap to grid within this many pixels.");
       snap_input->type(2);
       snap_input->box(FL_THIN_DOWN_BOX);
@@ -413,74 +418,74 @@ Fl_Double_Window* make_layout_window() {
       snap_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Int_Input* snap_input
-    { guides_toggle = new Fl_Check_Button(106, 80, 110, 25, "Show Guides");
+    { guides_toggle = new Fl_Check_Button(116, 80, 110, 25, "Show Guides");
       guides_toggle->tooltip("Show distance and alignment guides in overlay");
       guides_toggle->down_box(FL_DOWN_BOX);
       guides_toggle->callback((Fl_Callback*)guides_cb, (void*)(4));
     } // Fl_Check_Button* guides_toggle
-    { Fl_Button* o = new Fl_Button(215, 210, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(240, 210, 60, 25, "Close");
       o->tooltip("Close this dialog.");
       o->callback((Fl_Callback*)cb_Close2);
     } // Fl_Button* o
-    { Fl_Box* o = new Fl_Box(26, 10, 70, 25, "Grid:");
+    { Fl_Box* o = new Fl_Box(47, 10, 70, 25, "Grid:");
       o->labelfont(1);
       o->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE));
     } // Fl_Box* o
-    { Fl_Box* o = new Fl_Box(-1, 115, 97, 25, "Widget Size:");
+    { Fl_Box* o = new Fl_Box(10, 115, 107, 25, "Widget Size:");
       o->labelfont(1);
       o->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE));
     } // Fl_Box* o
     { Fl_Group* o = new Fl_Group(105, 115, 170, 75);
-      { def_widget_size[0] = new Fl_Round_Button(105, 115, 70, 25);
+      { def_widget_size[0] = new Fl_Round_Button(115, 115, 70, 25);
         def_widget_size[0]->type(102);
         def_widget_size[0]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[0]->callback((Fl_Callback*)default_widget_size_cb, (void*)(8));
       } // Fl_Round_Button* def_widget_size[0]
-      { Fl_Box* o = new Fl_Box(120, 115, 50, 25, "tiny");
+      { Fl_Box* o = new Fl_Box(130, 115, 50, 25, "tiny");
         o->labelsize(8);
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
-      { def_widget_size[1] = new Fl_Round_Button(180, 115, 70, 25);
+      { def_widget_size[1] = new Fl_Round_Button(202, 115, 70, 25);
         def_widget_size[1]->type(102);
         def_widget_size[1]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[1]->callback((Fl_Callback*)default_widget_size_cb, (void*)(11));
       } // Fl_Round_Button* def_widget_size[1]
-      { Fl_Box* o = new Fl_Box(195, 115, 50, 25, "small");
+      { Fl_Box* o = new Fl_Box(218, 115, 50, 25, "small");
         o->labelsize(11);
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
-      { def_widget_size[2] = new Fl_Round_Button(105, 140, 70, 25);
+      { def_widget_size[2] = new Fl_Round_Button(115, 140, 70, 25);
         def_widget_size[2]->type(102);
         def_widget_size[2]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[2]->callback((Fl_Callback*)default_widget_size_cb, (void*)(14));
       } // Fl_Round_Button* def_widget_size[2]
-      { Fl_Box* o = new Fl_Box(120, 140, 50, 25, "normal");
+      { Fl_Box* o = new Fl_Box(130, 140, 50, 25, "normal");
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
-      { def_widget_size[3] = new Fl_Round_Button(180, 140, 90, 25);
+      { def_widget_size[3] = new Fl_Round_Button(202, 140, 90, 25);
         def_widget_size[3]->type(102);
         def_widget_size[3]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[3]->callback((Fl_Callback*)default_widget_size_cb, (void*)(18));
       } // Fl_Round_Button* def_widget_size[3]
-      { Fl_Box* o = new Fl_Box(195, 140, 68, 25, "medium");
+      { Fl_Box* o = new Fl_Box(218, 140, 68, 25, "medium");
         o->labelsize(18);
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
-      { def_widget_size[4] = new Fl_Round_Button(105, 165, 75, 25);
+      { def_widget_size[4] = new Fl_Round_Button(115, 165, 75, 25);
         def_widget_size[4]->type(102);
         def_widget_size[4]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[4]->callback((Fl_Callback*)default_widget_size_cb, (void*)(24));
       } // Fl_Round_Button* def_widget_size[4]
-      { Fl_Box* o = new Fl_Box(120, 165, 64, 25, "large");
+      { Fl_Box* o = new Fl_Box(130, 165, 64, 25, "large");
         o->labelsize(24);
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
-      { def_widget_size[5] = new Fl_Round_Button(180, 165, 95, 25);
+      { def_widget_size[5] = new Fl_Round_Button(202, 165, 95, 25);
         def_widget_size[5]->type(102);
         def_widget_size[5]->down_box(FL_ROUND_DOWN_BOX);
         def_widget_size[5]->callback((Fl_Callback*)default_widget_size_cb, (void*)(32));
       } // Fl_Round_Button* def_widget_size[5]
-      { Fl_Box* o = new Fl_Box(195, 165, 76, 25, "huge");
+      { Fl_Box* o = new Fl_Box(218, 165, 76, 25, "huge");
         o->labelsize(32);
         o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 548e02685..fba0594be 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -79,29 +79,29 @@ Function {make_project_window()} {} {
       } {
         Fl_Box {} {
           label {Use "name.ext" to set a file name or just ".ext" to set extension.}
-          xywh {100 49 236 49} align 144
+          xywh {20 49 340 49} align 148
         }
         Fl_Input header_file_input {
           label {Header File:}
           user_data 1 user_data_type {void*}
           callback header_input_cb
-          tooltip {The name of the generated header file.} xywh {99 103 272 20} box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
+          tooltip {The name of the generated header file.} xywh {119 103 252 20} box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
         }
         Fl_Input code_file_input {
           label {Code File:}
           user_data 1 user_data_type {void*}
           callback code_input_cb
-          tooltip {The name of the generated code file.} xywh {100 128 272 20} box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
+          tooltip {The name of the generated code file.} xywh {119 128 252 20} box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
         }
         Fl_Check_Button include_H_from_C_button {
           label {Include Header from Code}
           callback include_H_from_C_button_cb
-          tooltip {Include the header file from the code file.} xywh {100 153 272 20} down_box DOWN_BOX
+          tooltip {Include the header file from the code file.} xywh {117 153 272 20} down_box DOWN_BOX
         }
         Fl_Check_Button use_FL_COMMAND_button {
           label {Menu shortcuts use FL_COMMAND}
           callback use_FL_COMMAND_button_cb
-          tooltip {Replace FL_CTRL with FL_COMMAND when generating menu shortcut code.} xywh {100 176 272 20} down_box DOWN_BOX
+          tooltip {Replace FL_CTRL with FL_COMMAND when generating menu shortcut code.} xywh {117 176 272 20} down_box DOWN_BOX
         }
       }
       Fl_Group {} {
@@ -160,12 +160,12 @@ decl {void scheme_cb(Fl_Choice *, void *);} {public local
 Function {make_settings_window()} {} {
   Fl_Window settings_window {
     label {GUI Settings} open
-    xywh {393 191 339 241} type Double non_modal visible
+    xywh {393 191 349 241} type Double non_modal visible
   } {
     Fl_Choice scheme_choice {
       label {Scheme: }
       callback scheme_cb open
-      xywh {116 10 115 25} down_box BORDER_BOX labelfont 1
+      xywh {140 10 115 25} down_box BORDER_BOX labelfont 1
       code0 {int s;}
       code1 {fluid_prefs.get("scheme", s, 0);}
       code2 {scheme_choice->value(s);}
@@ -197,13 +197,13 @@ Function {make_settings_window()} {} {
     } {
       Fl_Box {} {
         label {Options: }
-        xywh {116 43 1 25} labelfont 1 align 4
+        xywh {140 43 1 25} labelfont 1 align 4
       }
       Fl_Check_Button tooltips_button {
         label {Show Tooltips}
         callback {Fl_Tooltip::enable(tooltips_button->value());
 fluid_prefs.set("show_tooltips", tooltips_button->value());}
-        xywh {116 43 113 25} down_box DOWN_BOX
+        xywh {138 43 113 25} down_box DOWN_BOX labelsize 12
         code0 {int b;}
         code1 {fluid_prefs.get("show_tooltips", b, 1);}
         code2 {tooltips_button->value(b);}
@@ -212,7 +212,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button completion_button {
         label {Show Completion Dialogs}
         callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());}
-        xywh {116 68 186 25} down_box DOWN_BOX
+        xywh {138 68 186 25} down_box DOWN_BOX labelsize 12
         code0 {int b;}
         code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
         code2 {completion_button->value(b);}
@@ -220,7 +220,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button openlast_button {
         label {Open Previous File on Startup}
         callback {fluid_prefs.set("open_previous_file", openlast_button->value());}
-        xywh {116 93 214 25} down_box DOWN_BOX
+        xywh {138 93 214 25} down_box DOWN_BOX labelsize 12
         code0 {int b;}
         code1 {fluid_prefs.get("open_previous_file", b, 0);}
         code2 {openlast_button->value(b);}
@@ -228,7 +228,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button prevpos_button {
         label {Remember Window Positions}
         callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
-        xywh {116 118 209 25} down_box DOWN_BOX
+        xywh {138 118 209 25} down_box DOWN_BOX labelsize 12
         code0 {int b;}
         code1 {fluid_prefs.get("prev_window_pos", b, 1);}
         code2 {prevpos_button->value(b);}
@@ -238,7 +238,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
         callback {show_comments = show_comments_button->value();
 fluid_prefs.set("show_comments", show_comments);
 redraw_browser();}
-        xywh {116 143 209 25} down_box DOWN_BOX
+        xywh {138 143 209 25} down_box DOWN_BOX labelsize 12
         code1 {fluid_prefs.get("show_comments", show_comments, 1);}
         code2 {show_comments_button->value(show_comments);}
       }
@@ -247,7 +247,7 @@ redraw_browser();}
       label {\# Recent Files: }
       callback {fluid_prefs.set("recent_files", recent_spinner->value());
 load_history();}
-      xywh {115 173 40 25} labelfont 1 when 1
+      xywh {140 173 40 25} labelfont 1 when 1
       code0 {int c;}
       code1 {fluid_prefs.get("recent_files", c, 5);}
       code2 {recent_spinner->maximum(10);}
@@ -256,7 +256,7 @@ load_history();}
     Fl_Button {} {
       label Close
       callback {settings_window->hide();}
-      tooltip {Close this dialog.} xywh {266 205 64 25}
+      tooltip {Close this dialog.} xywh {276 205 64 25}
     }
   }
 } 
@@ -329,47 +329,47 @@ Function {make_shell_window()} {} {
 Function {make_layout_window()} {} {
   Fl_Window grid_window {
     label {Layout Settings} open
-    xywh {760 427 285 245} type Double non_modal visible
+    xywh {760 427 310 245} type Double non_modal visible
   } {
     Fl_Input horizontal_input {
       label x
       user_data 1 user_data_type long
       callback grid_cb
-      tooltip {Horizontal grid spacing.} xywh {106 10 50 25} type Int box THIN_DOWN_BOX align 8
+      tooltip {Horizontal grid spacing.} xywh {116 10 50 25} type Int box THIN_DOWN_BOX align 8
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input vertical_input {
       label pixels
       user_data 2 user_data_type long
       callback grid_cb
-      tooltip {Vertical grid spacing.} xywh {166 10 50 25} type Int box THIN_DOWN_BOX align 8
+      tooltip {Vertical grid spacing.} xywh {179 10 50 25} type Int box THIN_DOWN_BOX align 8
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input snap_input {
       label {pixel snap}
       user_data 3 user_data_type long
       callback grid_cb
-      tooltip {Snap to grid within this many pixels.} xywh {106 45 50 25} type Int box THIN_DOWN_BOX align 8
+      tooltip {Snap to grid within this many pixels.} xywh {116 45 50 25} type Int box THIN_DOWN_BOX align 8
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Check_Button guides_toggle {
       label {Show Guides}
       user_data 4 user_data_type long
       callback guides_cb
-      tooltip {Show distance and alignment guides in overlay} xywh {106 80 110 25} down_box DOWN_BOX
+      tooltip {Show distance and alignment guides in overlay} xywh {116 80 110 25} down_box DOWN_BOX
     }
     Fl_Button {} {
       label Close
       callback {grid_window->hide();}
-      tooltip {Close this dialog.} xywh {215 210 60 25}
+      tooltip {Close this dialog.} xywh {240 210 60 25}
     }
     Fl_Box {} {
       label {Grid:}
-      xywh {26 10 70 25} labelfont 1 align 24
+      xywh {47 10 70 25} labelfont 1 align 24
     }
     Fl_Box {} {
       label {Widget Size:}
-      xywh {-1 115 97 25} labelfont 1 align 24
+      xywh {10 115 107 25} labelfont 1 align 24
     }
     Fl_Group {} {open
       xywh {105 115 170 75}
@@ -377,56 +377,56 @@ Function {make_layout_window()} {} {
       Fl_Round_Button {def_widget_size[0]} {
         user_data 8 user_data_type long
         callback default_widget_size_cb
-        xywh {105 115 70 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {115 115 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label tiny
-        xywh {120 115 50 25} labelsize 8 align 20
+        xywh {130 115 50 25} labelsize 8 align 20
       }
       Fl_Round_Button {def_widget_size[1]} {
         user_data 11 user_data_type long
         callback default_widget_size_cb
-        xywh {180 115 70 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {202 115 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label small
-        xywh {195 115 50 25} labelsize 11 align 20
+        xywh {218 115 50 25} labelsize 11 align 20
       }
       Fl_Round_Button {def_widget_size[2]} {
         user_data 14 user_data_type long
         callback default_widget_size_cb
-        xywh {105 140 70 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {115 140 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label normal
-        xywh {120 140 50 25} align 20
+        xywh {130 140 50 25} align 20
       }
       Fl_Round_Button {def_widget_size[3]} {
         user_data 18 user_data_type long
         callback default_widget_size_cb
-        xywh {180 140 90 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {202 140 90 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label medium
-        xywh {195 140 68 25} labelsize 18 align 20
+        xywh {218 140 68 25} labelsize 18 align 20
       }
       Fl_Round_Button {def_widget_size[4]} {
         user_data 24 user_data_type long
         callback default_widget_size_cb
-        xywh {105 165 75 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {115 165 75 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label large
-        xywh {120 165 64 25} labelsize 24 align 20
+        xywh {130 165 64 25} labelsize 24 align 20
       }
       Fl_Round_Button {def_widget_size[5]} {
         user_data 32 user_data_type long
         callback default_widget_size_cb
-        xywh {180 165 95 25} type Radio down_box ROUND_DOWN_BOX
+        xywh {202 165 95 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
         label huge
-        xywh {195 165 76 25} labelsize 32 align 20
+        xywh {218 165 76 25} labelsize 32 align 20
       }
     }
   }
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index f08e81432..e5e20f9a2 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #ifndef alignment_panel_h
 #define alignment_panel_h
diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx
index 2b2ad4698..5266d47cf 100644
--- a/fluid/print_panel.cxx
+++ b/fluid/print_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #include "print_panel.h"
 #include <stdio.h>
@@ -443,10 +443,12 @@ Fl_Double_Window* make_print_panel() {
     { print_page_size = new Fl_Choice(110, 10, 80, 25, "Page Size:");
       print_page_size->down_box(FL_BORDER_BOX);
       print_page_size->labelfont(1);
+      print_page_size->labelsize(12);
       print_page_size->menu(menu_print_page_size);
     } // Fl_Choice* print_page_size
     { Fl_Group* o = new Fl_Group(110, 45, 170, 40, "Output Mode:");
       o->labelfont(1);
+      o->labelsize(12);
       o->align(Fl_Align(FL_ALIGN_LEFT));
       { print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
         print_output_mode[0]->type(102);
diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl
index a37612777..4d84dd32f 100644
--- a/fluid/print_panel.fl
+++ b/fluid/print_panel.fl
@@ -214,7 +214,7 @@ print_update_status();} open
   } {
     Fl_Choice print_page_size {
       label {Page Size:}
-      xywh {110 10 80 25} down_box BORDER_BOX labelfont 1
+      xywh {110 10 80 25} down_box BORDER_BOX labelfont 1 labelsize 12
     } {
       MenuItem {} {
         label Letter
@@ -227,7 +227,7 @@ print_update_status();} open
     }
     Fl_Group {} {
       label {Output Mode:} open
-      xywh {110 45 170 40} labelfont 1 align 4
+      xywh {110 45 170 40} labelfont 1 labelsize 12 align 4
     } {
       Fl_Button {print_output_mode[0]} {
         image {pixmaps/print_color.xpm} xywh {110 45 30 40} type Radio box BORDER_BOX down_box BORDER_BOX value 1 color 7 selection_color 0
diff --git a/fluid/print_panel.h b/fluid/print_panel.h
index 438016992..38d097ff9 100644
--- a/fluid/print_panel.h
+++ b/fluid/print_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #ifndef print_panel_h
 #define print_panel_h
diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx
index cbe3a2e23..157c8e8f3 100644
--- a/fluid/template_panel.cxx
+++ b/fluid/template_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #include "template_panel.h"
 #include <stdio.h>
@@ -147,7 +147,7 @@ Fl_Double_Window* make_template_panel() {
       template_preview->align(Fl_Align(69|FL_ALIGN_INSIDE));
       Fl_Group::current()->resizable(template_preview);
     } // Fl_Box* template_preview
-    { template_name = new Fl_Input(124, 288, 326, 25, "Template Name:");
+    { template_name = new Fl_Input(144, 288, 306, 25, "Template Name:");
       template_name->labelfont(1);
       template_name->textfont(4);
       template_name->callback((Fl_Callback*)cb_template_name);
@@ -159,7 +159,7 @@ Fl_Double_Window* make_template_panel() {
       template_instance->hide();
     } // Fl_Input* template_instance
     { Fl_Group* o = new Fl_Group(10, 323, 440, 25);
-      { template_delete = new Fl_Button(10, 323, 133, 25, "Delete Template");
+      { template_delete = new Fl_Button(10, 323, 143, 25, "Delete Template");
         template_delete->callback((Fl_Callback*)template_delete_cb);
       } // Fl_Button* template_delete
       { Fl_Box* o = new Fl_Box(153, 323, 126, 25);
diff --git a/fluid/template_panel.h b/fluid/template_panel.h
index b35e3ea37..10a07c52c 100644
--- a/fluid/template_panel.h
+++ b/fluid/template_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #ifndef template_panel_h
 #define template_panel_h
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 8aa4784b2..4809f259c 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #include "widget_panel.h"
 
@@ -161,7 +161,7 @@ Fl_Double_Window* make_widget_panel() {
           } // Fl_Button* o
           o->end();
         } // Fl_Group* o
-        { Fl_Group* o = new Fl_Group(95, 115, 300, 20, "Alignment:");
+        { Fl_Group* o = new Fl_Group(95, 115, 310, 20, "Alignment:");
           o->labelfont(1);
           o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
@@ -174,14 +174,14 @@ Fl_Double_Window* make_widget_panel() {
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
             o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE));
           } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(130, 115, 30, 20, "Wrap");
+          { Fl_Button* o = new Fl_Button(130, 115, 38, 20, "Wrap");
             o->tooltip("Wrap the label text.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
             o->labelsize(11);
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
           } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(270, 115, 20, 20, "@-1<-");
+          { Fl_Button* o = new Fl_Button(278, 115, 20, 20, "@-1<-");
             o->tooltip("Left-align the label.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
@@ -190,7 +190,7 @@ Fl_Double_Window* make_widget_panel() {
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
             o->hide();
           } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1->");
+          { Fl_Button* o = new Fl_Button(303, 115, 20, 20, "@-1->");
             o->tooltip("Right-align the label.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
@@ -199,7 +199,7 @@ Fl_Double_Window* make_widget_panel() {
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
             o->hide();
           } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(320, 115, 20, 20, "@-18");
+          { Fl_Button* o = new Fl_Button(328, 115, 20, 20, "@-18");
             o->tooltip("Top-align the label.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
@@ -208,7 +208,7 @@ Fl_Double_Window* make_widget_panel() {
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
             o->hide();
           } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(345, 115, 20, 20, "@-12");
+          { Fl_Button* o = new Fl_Button(353, 115, 20, 20, "@-12");
             o->tooltip("Bottom-align the label.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
@@ -217,21 +217,21 @@ Fl_Double_Window* make_widget_panel() {
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
             o->hide();
           } // Fl_Button* o
-          { Fl_Choice* o = new Fl_Choice(165, 115, 110, 20);
+          { Fl_Choice* o = new Fl_Choice(172, 115, 110, 20);
             o->down_box(FL_BORDER_BOX);
             o->labelsize(11);
             o->textsize(11);
             o->callback((Fl_Callback*)align_text_image_cb);
             o->menu(menu_);
           } // Fl_Choice* o
-          { Fl_Choice* o = new Fl_Choice(280, 115, 85, 20);
+          { Fl_Choice* o = new Fl_Choice(288, 115, 85, 20);
             o->down_box(FL_BORDER_BOX);
             o->labelsize(11);
             o->textsize(11);
             o->callback((Fl_Callback*)align_position_cb);
             o->menu(menu_1);
           } // Fl_Choice* o
-          { Fl_Button* o = new Fl_Button(370, 115, 20, 20, "@-3square");
+          { Fl_Button* o = new Fl_Button(378, 115, 20, 20, "@-3square");
             o->tooltip("Show the label inside the widget.");
             o->type(1);
             o->selection_color(FL_INACTIVE_COLOR);
@@ -239,13 +239,13 @@ Fl_Double_Window* make_widget_panel() {
             o->labelcolor(FL_INACTIVE_COLOR);
             o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
           } // Fl_Button* o
-          { Fl_Box* o = new Fl_Box(395, 115, 0, 20);
+          { Fl_Box* o = new Fl_Box(404, 115, 0, 20);
             o->labelsize(11);
             Fl_Group::current()->resizable(o);
           } // Fl_Box* o
           o->end();
         } // Fl_Group* o
-        { Fl_Group* o = new Fl_Group(95, 150, 300, 20, "Position:");
+        { Fl_Group* o = new Fl_Group(95, 150, 314, 20, "Position:");
           o->labelfont(1);
           o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
@@ -286,13 +286,13 @@ Fl_Double_Window* make_widget_panel() {
             widget_h_input->callback((Fl_Callback*)h_cb);
             widget_h_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
           } // Fl_Value_Input* widget_h_input
-          { Fl_Light_Button* o = new Fl_Light_Button(335, 150, 55, 20, "Relative");
+          { Fl_Light_Button* o = new Fl_Light_Button(335, 150, 65, 20, "Relative");
             o->tooltip("If set, widgets inside a widget class of type Fl_Group are repositioned relat\
 ive to the origin at construction time");
             o->labelsize(11);
             o->callback((Fl_Callback*)wc_relative_cb);
           } // Fl_Light_Button* o
-          { Fl_Box* o = new Fl_Box(394, 150, 1, 20);
+          { Fl_Box* o = new Fl_Box(398, 150, 1, 20);
             Fl_Group::current()->resizable(o);
           } // Fl_Box* o
           o->end();
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 88d9d77de..aff63039b 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -87,7 +87,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
         Fl_Group {} {
           label {Alignment:}
           callback propagate_load open
-          xywh {95 115 300 20} labelfont 1 labelsize 11 align 4
+          xywh {95 115 310 20} labelfont 1 labelsize 11 align 4
         } {
           Fl_Button {} {
             label Clip
@@ -99,35 +99,35 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
             label Wrap
             user_data FL_ALIGN_WRAP
             callback align_cb
-            tooltip {Wrap the label text.} xywh {130 115 30 20} type Toggle selection_color 8 labelsize 11
+            tooltip {Wrap the label text.} xywh {130 115 38 20} type Toggle selection_color 8 labelsize 11
           }
           Fl_Button {} {
             label {@-1<-}
             user_data FL_ALIGN_LEFT
             callback align_cb
-            tooltip {Left-align the label.} xywh {270 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+            tooltip {Left-align the label.} xywh {278 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
           }
           Fl_Button {} {
             label {@-1->}
             user_data FL_ALIGN_RIGHT
             callback align_cb
-            tooltip {Right-align the label.} xywh {295 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+            tooltip {Right-align the label.} xywh {303 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
           }
           Fl_Button {} {
             label {@-18}
             user_data FL_ALIGN_TOP
             callback align_cb
-            tooltip {Top-align the label.} xywh {320 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+            tooltip {Top-align the label.} xywh {328 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
           }
           Fl_Button {} {
             label {@-12}
             user_data FL_ALIGN_BOTTOM
             callback align_cb
-            tooltip {Bottom-align the label.} xywh {345 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+            tooltip {Bottom-align the label.} xywh {353 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
           }
           Fl_Choice {} {
             callback align_text_image_cb open selected
-            xywh {165 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11
+            xywh {172 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11
           } {
             MenuItem {} {
               label {   Image Alignment   }
@@ -162,7 +162,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
           }
           Fl_Choice {} {
             callback align_position_cb open
-            xywh {280 115 85 20} down_box BORDER_BOX labelsize 11 textsize 11
+            xywh {288 115 85 20} down_box BORDER_BOX labelsize 11 textsize 11
           } {
             MenuItem {} {
               label {   Inside && Outside   }
@@ -244,16 +244,16 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
             label {@-3square}
             user_data FL_ALIGN_INSIDE
             callback align_cb
-            tooltip {Show the label inside the widget.} xywh {370 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+            tooltip {Show the label inside the widget.} xywh {378 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
           }
           Fl_Box {} {
-            xywh {395 115 0 20} labelsize 11 resizable
+            xywh {404 115 0 20} labelsize 11 resizable
           }
         }
         Fl_Group {} {
           label {Position:}
           callback propagate_load
-          xywh {95 150 300 20} labelfont 1 labelsize 11 align 4
+          xywh {95 150 314 20} labelfont 1 labelsize 11 align 4
         } {
           Fl_Value_Input widget_x_input {
             label {X:}
@@ -278,10 +278,10 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
           Fl_Light_Button {} {
             label Relative
             callback wc_relative_cb
-            tooltip {If set, widgets inside a widget class of type Fl_Group are repositioned relative to the origin at construction time} xywh {335 150 55 20} labelsize 11
+            tooltip {If set, widgets inside a widget class of type Fl_Group are repositioned relative to the origin at construction time} xywh {335 150 65 20} labelsize 11
           }
           Fl_Box {} {
-            xywh {394 150 1 20} resizable
+            xywh {398 150 1 20} resizable
           }
         }
         Fl_Group {} {
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index 5261d7139..bb9b0d4b2 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0302
 
 #ifndef widget_panel_h
 #define widget_panel_h