diff options
| author | Greg Ercolano <erco@seriss.com> | 2014-05-17 20:46:25 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2014-05-17 20:46:25 +0000 |
| commit | 2c820fd53dad8a753721a9a4ff5d8daced7345ee (patch) | |
| tree | 64eb906c40d0de9999eef42c4f389cf7669ccf42 /fluid/widget_panel.cxx | |
| parent | 4c301eb6f9e27c63ca08115a7111882dafd5bcff (diff) | |
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
Diffstat (limited to 'fluid/widget_panel.cxx')
| -rw-r--r-- | fluid/widget_panel.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
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(); |
