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

1 files changed, 42 insertions, 37 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