diff options
| -rw-r--r-- | fluid/widget_panel.cxx | 38 | ||||
| -rw-r--r-- | fluid/widget_panel.fl | 43 | ||||
| -rw-r--r-- | fluid/widget_panel.h | 6 |
3 files changed, 47 insertions, 40 deletions
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index da8c0f1b7..0e9416c4f 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -823,39 +823,43 @@ access the Widget pointer and \'v\' to access the user value."); o->end(); Fl_Group::current()->resizable(o); } // Fl_Tabs* o - { Fl_Group* o = new Fl_Group(9, 370, 400, 20); + { Fl_Group* o = new Fl_Group(10, 370, 400, 20); o->labelsize(11); - { Fl_Box* o = new Fl_Box(9, 370, 20, 20); + { // Hidden resizable box + Fl_Box* o = new Fl_Box(10, 370, 75, 20); o->labelsize(11); + o->hide(); Fl_Group::current()->resizable(o); } // Fl_Box* o - { Fl_Button* o = new Fl_Button(240, 370, 99, 20, "Hide &Overlays"); + { // Hidden Revert button + Fl_Button* o = new Fl_Button(90, 370, 60, 20, "Revert"); + o->labelsize(11); + o->callback((Fl_Callback*)revert_cb); + o->hide(); + } // Fl_Button* o + { wLiveMode = new Fl_Button(155, 370, 80, 20, "Live &Mode"); + wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ +avior."); + wLiveMode->type(1); + wLiveMode->labelsize(11); + wLiveMode->callback((Fl_Callback*)live_mode_cb); + } // Fl_Button* wLiveMode + { Fl_Button* o = new Fl_Button(240, 370, 100, 20, "Hide &Overlays"); o->tooltip("Hide the widget overlay box."); o->labelsize(11); o->labelcolor((Fl_Color)1); o->callback((Fl_Callback*)overlay_cb); } // Fl_Button* o - { Fl_Button* o = new Fl_Button(66, 370, 80, 20, "Revert"); - o->labelsize(11); - o->callback((Fl_Callback*)revert_cb); - o->hide(); - } // Fl_Button* o - { Fl_Return_Button* o = new Fl_Return_Button(344, 370, 64, 20, "Close"); + { Fl_Return_Button* o = new Fl_Return_Button(345, 370, 65, 20, "Close"); o->labelsize(11); o->callback((Fl_Callback*)ok_cb); } // Fl_Return_Button* o - { Fl_Button* o = new Fl_Button(339, 370, 70, 20, "Cancel"); + { // Hidden cancel button + Fl_Button* o = new Fl_Button(345, 370, 65, 20, "Cancel"); o->labelsize(11); o->callback((Fl_Callback*)cancel_cb); o->hide(); } // Fl_Button* o - { wLiveMode = new Fl_Button(151, 370, 84, 20, "Live &Mode"); - wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ -avior."); - wLiveMode->type(1); - wLiveMode->labelsize(11); - wLiveMode->callback((Fl_Callback*)live_mode_cb); - } // Fl_Button* wLiveMode o->end(); } // Fl_Group* o o->size_range(o->w(), o->h()); diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index fefe6edb6..4376a311c 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -30,8 +30,8 @@ Function {make_widget_panel()} { } { Fl_Window {} { comment {Use a Double Window to avoid flickering.} open - xywh {468 187 420 400} type Double labelsize 11 align 80 hide resizable hotspot - code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} + xywh {560 60 420 400} type Double labelsize 11 align 80 resizable hotspot + code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible } { Fl_Tabs {} { callback {propagate_load((Fl_Group *)o,v);} open @@ -91,7 +91,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 + callback propagate_load xywh {95 115 310 20} labelfont 1 labelsize 11 align 4 } { Fl_Button {} { @@ -141,7 +141,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te } MenuItem {} { label {image over text} - user_data {(fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT} selected + user_data {(fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT} xywh {25 25 100 20} labelsize 11 } MenuItem {} { @@ -520,7 +520,7 @@ Use Ctrl-J for newlines.} xywh {95 285 310 20} labelfont 1 labelsize 11 textsize } Fl_Group {} { label {C++} - callback propagate_load open + callback propagate_load xywh {10 30 400 330} labelsize 11 when 0 hide } { Fl_Group {} { @@ -666,35 +666,38 @@ wCallback->do_callback(wCallback, v);} open } } Fl_Group {} {open - xywh {9 370 400 20} labelsize 11 + xywh {10 370 400 20} labelsize 11 } { Fl_Box {} { - xywh {9 370 20 20} labelsize 11 resizable - } - Fl_Button {} { - label {Hide &Overlays} - callback overlay_cb - tooltip {Hide the widget overlay box.} xywh {240 370 99 20} labelsize 11 labelcolor 1 + comment {Hidden resizable box} + xywh {10 370 75 20} labelsize 11 hide resizable } Fl_Button {} { label Revert callback revert_cb - xywh {66 370 80 20} labelsize 11 hide + comment {Hidden Revert button} + xywh {90 370 60 20} labelsize 11 hide + } + Fl_Button wLiveMode { + label {Live &Mode} + callback live_mode_cb + tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {155 370 80 20} type Toggle labelsize 11 + } + Fl_Button {} { + label {Hide &Overlays} + callback overlay_cb + tooltip {Hide the widget overlay box.} xywh {240 370 100 20} labelsize 11 labelcolor 1 } Fl_Return_Button {} { label Close callback ok_cb - xywh {344 370 64 20} labelsize 11 + xywh {345 370 65 20} labelsize 11 } Fl_Button {} { label Cancel callback cancel_cb - xywh {339 370 70 20} labelsize 11 hide - } - Fl_Button wLiveMode { - label {Live &Mode} - callback live_mode_cb - tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {151 370 84 20} type Toggle labelsize 11 + comment {Hidden cancel button} + xywh {345 370 65 20} labelsize 11 hide } } } diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h index 60ad5670b..518c4956b 100644 --- a/fluid/widget_panel.h +++ b/fluid/widget_panel.h @@ -102,13 +102,13 @@ extern Fl_Menu_Item whenmenu[]; extern void when_cb(Fl_Choice*, void*); extern void user_data_type_cb(Fl_Input*, void*); extern void when_button_cb(Fl_Light_Button*, void*); -extern void overlay_cb(Fl_Button*, void*); extern void revert_cb(Fl_Button*, void*); +extern void live_mode_cb(Fl_Button*, void*); +extern Fl_Button *wLiveMode; +extern void overlay_cb(Fl_Button*, void*); #include <FL/Fl_Return_Button.H> extern void ok_cb(Fl_Return_Button*, void*); extern void cancel_cb(Fl_Button*, void*); -extern void live_mode_cb(Fl_Button*, void*); -extern Fl_Button *wLiveMode; Fl_Double_Window* make_widget_panel(); extern Fl_Menu_Item menu_[]; extern Fl_Menu_Item menu_1[]; |
