| |
Author: matt
Date: 2005-05-29 18:28:13 -0400 (Sun, 29 May 2005)
New Revision: 4378
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/fluid/function_panel.cxx
branches/branch-1.1/fluid/function_panel.fl
branches/branch-1.1/fluid/widget_panel.cxx
branches/branch-1.1/fluid/widget_panel.fl
Log:
Fluid panel resize and alignment fixes (STR #891).
Everything should resize nicely now. All Widgets have been realigned. Hope you guys like it... .
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2005-05-29 07:15:39 UTC (rev 4377)
+++ branches/branch-1.1/CHANGES 2005-05-29 22:28:13 UTC (rev 4378)
@@ -2,6 +2,7 @@
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
+ - Fluid panel resize and alignment fixes (STR #891)
- Fl_Window::show(argc, argv) now sets the scheme before
showing the window; this should eliminate any
flickering between the standard and plastic schemes on
Modified: branches/branch-1.1/fluid/function_panel.cxx
===================================================================
--- branches/branch-1.1/fluid/function_panel.cxx 2005-05-29 07:15:39 UTC (rev 4377)
+++ branches/branch-1.1/fluid/function_panel.cxx 2005-05-29 22:28:13 UTC (rev 4378)
@@ -103,7 +103,7 @@
}
o->end();
}
- o->size_range(292, 152, 2002, 152);
+ o->size_range(o->w(), o->h(), Fl::w(), o->h());
o->set_modal();
o->end();
}
@@ -120,10 +120,10 @@
Fl_Window* make_code_panel() {
Fl_Window* w;
- { Fl_Window* o = code_panel = new Fl_Window(545, 175, "Code Properties");
+ { Fl_Window* o = code_panel = new Fl_Window(540, 180, "Code Properties");
w = o;
o->labelsize(11);
- { CodeEditor* o = code_input = new CodeEditor(10, 12, 525, 123);
+ { CodeEditor* o = code_input = new CodeEditor(10, 10, 520, 130);
o->box(FL_DOWN_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->selection_color(FL_SELECTION_COLOR);
@@ -138,22 +138,23 @@
Fl_Group::current()->resizable(o);
o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE);
}
- { Fl_Group* o = new Fl_Group(12, 145, 523, 20);
+ { Fl_Group* o = new Fl_Group(10, 150, 520, 20);
o->labelsize(11);
- { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(419, 145, 55, 20, "OK");
+ { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(400, 150, 60, 20, "OK");
o->labelsize(11);
w->hotspot(o);
}
- { Fl_Button* o = code_panel_cancel = new Fl_Button(479, 145, 56, 20, "Cancel");
+ { Fl_Button* o = code_panel_cancel = new Fl_Button(470, 150, 60, 20, "Cancel");
o->shortcut(0xff1b);
o->labelsize(11);
}
- { Fl_Box* o = new Fl_Box(12, 145, 402, 20);
+ { Fl_Box* o = new Fl_Box(10, 150, 380, 20);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
o->end();
}
+ o->size_range(200, 150);
o->set_modal();
o->end();
}
@@ -172,34 +173,41 @@
Fl_Window* make_codeblock_panel() {
Fl_Window* w;
- { Fl_Window* o = codeblock_panel = new Fl_Window(295, 100, "Code Block Properties");
+ { Fl_Window* o = codeblock_panel = new Fl_Window(300, 115, "Code Block Properties");
w = o;
o->labelsize(11);
- { Fl_Input* o = code_before_input = new Fl_Input(10, 10, 275, 20);
+ { Fl_Input* o = code_before_input = new Fl_Input(10, 15, 280, 20, "Conditional code block");
o->tooltip("#ifdef or similar conditional code block.");
o->labelsize(11);
o->textfont(4);
o->textsize(11);
o->align(FL_ALIGN_TOP_LEFT);
o->when(FL_WHEN_NEVER);
- Fl_Group::current()->resizable(o);
}
- { Fl_Input* o = code_after_input = new Fl_Input(10, 49, 275, 19, "\"{...child code...}\" is inserted here");
+ { Fl_Input* o = code_after_input = new Fl_Input(10, 55, 280, 20, "\"{...child code...}\" is inserted here");
o->tooltip("#endif or similar conditional code block.");
o->labelsize(11);
o->textfont(4);
o->textsize(11);
o->align(FL_ALIGN_TOP_LEFT);
o->when(FL_WHEN_NEVER);
+ Fl_Group::current()->resizable(o);
}
- { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(164, 73, 60, 20, "OK");
- o->labelsize(11);
- w->hotspot(o);
+ { Fl_Group* o = new Fl_Group(10, 85, 280, 20);
+ { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(160, 85, 60, 20, "OK");
+ o->labelsize(11);
+ w->hotspot(o);
+ }
+ { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(230, 85, 60, 20, "Cancel");
+ o->shortcut(0xff1b);
+ o->labelsize(11);
+ }
+ { Fl_Box* o = new Fl_Box(10, 85, 140, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(229, 73, 56, 20, "Cancel");
- o->shortcut(0xff1b);
- o->labelsize(11);
- }
+ o->size_range(o->w(), o->h(), Fl::w(), o->h());
o->set_modal();
o->end();
}
@@ -220,10 +228,10 @@
Fl_Window* make_declblock_panel() {
Fl_Window* w;
- { Fl_Window* o = declblock_panel = new Fl_Window(295, 125, "Declaration Block Properties");
+ { Fl_Window* o = declblock_panel = new Fl_Window(300, 135, "Declaration Block Properties");
w = o;
o->labelsize(11);
- { Fl_Input* o = decl_before_input = new Fl_Input(10, 35, 275, 20);
+ { Fl_Input* o = decl_before_input = new Fl_Input(10, 40, 280, 20);
o->tooltip("#ifdef or similar conditional declaration block.");
o->labelsize(11);
o->textfont(4);
@@ -232,7 +240,7 @@
o->when(FL_WHEN_NEVER);
Fl_Group::current()->resizable(o);
}
- { Fl_Input* o = decl_after_input = new Fl_Input(10, 74, 275, 20, "\"\\n...child code...\\n\" is inserted here");
+ { Fl_Input* o = decl_after_input = new Fl_Input(10, 75, 280, 20, "\"\\n...child code...\\n\" is inserted here");
o->tooltip("#endif or similar declaration code block.");
o->labelsize(11);
o->textfont(4);
@@ -240,19 +248,32 @@
o->align(FL_ALIGN_TOP_LEFT);
o->when(FL_WHEN_NEVER);
}
- { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(169, 99, 55, 20, "OK");
- o->labelsize(11);
- w->hotspot(o);
+ { Fl_Group* o = new Fl_Group(10, 105, 280, 20);
+ { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(160, 105, 60, 20, "OK");
+ o->labelsize(11);
+ w->hotspot(o);
+ }
+ { Fl_Button* o = declblock_panel_cancel = new Fl_Button(230, 105, 60, 20, "Cancel");
+ o->shortcut(0xff1b);
+ o->labelsize(11);
+ }
+ { Fl_Box* o = new Fl_Box(10, 105, 140, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Button* o = declblock_panel_cancel = new Fl_Button(229, 99, 56, 20, "Cancel");
- o->shortcut(0xff1b);
- o->labelsize(11);
+ { Fl_Group* o = new Fl_Group(10, 10, 280, 20);
+ { Fl_Light_Button* o = declblock_public_button = new Fl_Light_Button(10, 10, 60, 20, "public");
+ o->tooltip("Make the declaration publicly accessible.");
+ o->labelsize(11);
+ o->when(FL_WHEN_NEVER);
+ }
+ { Fl_Box* o = new Fl_Box(80, 10, 210, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Light_Button* o = declblock_public_button = new Fl_Light_Button(10, 10, 54, 20, "public");
- o->tooltip("Make the declaration publicly accessible.");
- o->labelsize(11);
- o->when(FL_WHEN_NEVER);
- }
+ o->size_range(o->w(), o->h(), Fl::w(), o->h());
o->set_modal();
o->end();
}
@@ -271,14 +292,20 @@
Fl_Window* make_decl_panel() {
Fl_Window* w;
- { Fl_Window* o = decl_panel = new Fl_Window(290, 145, "Declaration Properties");
+ { Fl_Window* o = decl_panel = new Fl_Window(290, 150, "Declaration Properties");
w = o;
- { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 10, 54, 20, "public");
- o->tooltip("Make the declaration publicly accessible.");
- o->labelsize(11);
- o->when(FL_WHEN_NEVER);
+ { Fl_Group* o = new Fl_Group(10, 10, 270, 20);
+ { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 10, 60, 20, "public");
+ o->tooltip("Make the declaration publicly accessible.");
+ o->labelsize(11);
+ o->when(FL_WHEN_NEVER);
+ }
+ { Fl_Box* o = new Fl_Box(80, 10, 200, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Input* o = decl_input = new Fl_Input(10, 35, 270, 19, "Can be any declaration, like \"int x;\", an external symbol like \"extern int\
+ { Fl_Input* o = decl_input = new Fl_Input(10, 40, 270, 20, "Can be any declaration, like \"int x;\", an external symbol like \"extern int\
foo();\", a #directive like \"#include <foo.h>\", a comment like \"//foo\" or\
\"/*foo*/\", or typedef like \"typedef char byte;\" or \"using std::list;\".");
o->tooltip("Declaration text.");
@@ -289,14 +316,21 @@
o->when(FL_WHEN_NEVER);
Fl_Group::current()->resizable(o);
}
- { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(164, 116, 55, 20, "OK");
- o->labelsize(11);
- w->hotspot(o);
+ { Fl_Group* o = new Fl_Group(10, 120, 270, 20);
+ { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(150, 120, 60, 20, "OK");
+ o->labelsize(11);
+ w->hotspot(o);
+ }
+ { Fl_Button* o = decl_panel_cancel = new Fl_Button(220, 120, 60, 20, "Cancel");
+ o->shortcut(0xff1b);
+ o->labelsize(11);
+ }
+ { Fl_Box* o = new Fl_Box(10, 120, 130, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Button* o = decl_panel_cancel = new Fl_Button(224, 116, 56, 20, "Cancel");
- o->shortcut(0xff1b);
- o->labelsize(11);
- }
+ o->size_range(o->w(), o->h(), Fl::w(), o->h());
o->end();
}
return w;
@@ -316,15 +350,21 @@
Fl_Window* make_class_panel() {
Fl_Window* w;
- { Fl_Window* o = class_panel = new Fl_Window(285, 140, "Class Properties");
+ { Fl_Window* o = class_panel = new Fl_Window(300, 140, "Class Properties");
w = o;
o->labelsize(11);
- { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 54, 20, "public");
- o->tooltip("Make the class publicly accessible.");
- o->labelsize(11);
- o->when(FL_WHEN_NEVER);
+ { Fl_Group* o = new Fl_Group(10, 10, 280, 20);
+ { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 60, 20, "public");
+ o->tooltip("Make the class publicly accessible.");
+ o->labelsize(11);
+ o->when(FL_WHEN_NEVER);
+ }
+ { Fl_Box* o = new Fl_Box(80, 10, 210, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Input* o = c_name_input = new Fl_Input(10, 49, 265, 19, "Name:");
+ { Fl_Input* o = c_name_input = new Fl_Input(10, 45, 280, 20, "Name:");
o->tooltip("Name of class.");
o->labelfont(1);
o->labelsize(11);
@@ -334,7 +374,7 @@
o->when(FL_WHEN_NEVER);
Fl_Group::current()->resizable(o);
}
- { Fl_Input* o = c_subclass_input = new Fl_Input(10, 87, 265, 19, "Subclass of (text between : and {)");
+ { Fl_Input* o = c_subclass_input = new Fl_Input(10, 80, 280, 20, "Subclass of (text between : and {)");
o->tooltip("Name of subclass.");
o->labelfont(1);
o->labelsize(11);
@@ -343,14 +383,21 @@
o->align(FL_ALIGN_TOP_LEFT);
o->when(FL_WHEN_NEVER);
}
- { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(159, 111, 55, 20, "OK");
- o->labelsize(11);
- w->hotspot(o);
+ { Fl_Group* o = new Fl_Group(10, 110, 280, 20);
+ { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(160, 110, 60, 20, "OK");
+ o->labelsize(11);
+ w->hotspot(o);
+ }
+ { Fl_Button* o = c_panel_cancel = new Fl_Button(230, 110, 60, 20, "Cancel");
+ o->shortcut(0xff1b);
+ o->labelsize(11);
+ }
+ { Fl_Box* o = new Fl_Box(10, 110, 140, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Button* o = c_panel_cancel = new Fl_Button(219, 111, 56, 20, "Cancel");
- o->shortcut(0xff1b);
- o->labelsize(11);
- }
+ o->size_range(o->w(), o->h(), Fl::w(), o->h());
o->set_modal();
o->end();
}
@@ -434,6 +481,7 @@
}
o->end();
}
+ o->size_range(320, 180);
o->set_modal();
o->end();
}
@@ -779,7 +827,6 @@
}
o->end();
}
- o->size(520,87); // just to make sure...
o->set_non_modal();
o->end();
}
Modified: branches/branch-1.1/fluid/function_panel.fl
===================================================================
--- branches/branch-1.1/fluid/function_panel.fl 2005-05-29 07:15:39 UTC (rev 4377)
+++ branches/branch-1.1/fluid/function_panel.fl 2005-05-29 22:28:13 UTC (rev 4378)
@@ -48,7 +48,7 @@
Fl_Window function_panel {
label {Function/Method Properties}
xywh {419 200 292 152} type Single hide resizable
- code0 {o->size_range(292, 152, 2002, 152);} modal
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
Fl_Group {} {open
xywh {10 10 270 20}
@@ -95,27 +95,28 @@
} {
Fl_Window code_panel {
label {Code Properties}
- xywh {527 128 545 175} type Single labelsize 11 hide resizable modal
+ xywh {353 262 540 180} type Single labelsize 11 hide resizable
+ code0 {o->size_range(200, 150);} modal
} {
Fl_Text_Editor code_input {
- xywh {10 12 525 123} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
+ xywh {10 10 520 130} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
code0 {o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE);}
code1 {\#include "CodeEditor.h"}
class CodeEditor
}
Fl_Group {} {open
- xywh {12 145 523 20} labelsize 11
+ xywh {10 150 520 20} labelsize 11
} {
Fl_Return_Button code_panel_ok {
label OK
- xywh {419 145 55 20} labelsize 11 hotspot
+ xywh {400 150 60 20} labelsize 11 hotspot
}
Fl_Button code_panel_cancel {
label Cancel
- xywh {479 145 56 20} shortcut 0xff1b labelsize 11
+ xywh {470 150 60 20} shortcut 0xff1b labelsize 11
}
Fl_Box {} {
- xywh {12 145 402 20} labelsize 11 resizable
+ xywh {10 150 380 20} labelsize 11 resizable
}
}
}
@@ -125,23 +126,32 @@
} {
Fl_Window codeblock_panel {
label {Code Block Properties}
- xywh {845 158 295 100} type Single labelsize 11 hide resizable modal
+ xywh {468 221 300 115} type Single labelsize 11 hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
Fl_Input code_before_input {
- tooltip {\#ifdef or similar conditional code block.} xywh {10 10 275 20} labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
+ label {Conditional code block}
+ tooltip {\#ifdef or similar conditional code block.} xywh {10 15 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11
}
Fl_Input code_after_input {
label {"{...child code...}" is inserted here}
- tooltip {\#endif or similar conditional code block.} xywh {10 49 275 19} labelsize 11 align 5 when 0 textfont 4 textsize 11
+ tooltip {\#endif or similar conditional code block.} xywh {10 55 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
}
- Fl_Return_Button codeblock_panel_ok {
- label OK
- xywh {164 73 60 20} labelsize 11 hotspot
+ Fl_Group {} {open
+ xywh {10 85 280 20}
+ } {
+ Fl_Return_Button codeblock_panel_ok {
+ label OK
+ xywh {160 85 60 20} labelsize 11 hotspot
+ }
+ Fl_Button codeblock_panel_cancel {
+ label Cancel
+ xywh {230 85 60 20} shortcut 0xff1b labelsize 11
+ }
+ Fl_Box {} {
+ xywh {10 85 140 20} resizable
+ }
}
- Fl_Button codeblock_panel_cancel {
- label Cancel
- xywh {229 73 56 20} shortcut 0xff1b labelsize 11
- }
}
}
@@ -149,27 +159,42 @@
} {
Fl_Window declblock_panel {
label {Declaration Block Properties}
- xywh {665 33 295 125} type Single labelsize 11 hide resizable modal
+ xywh {428 215 300 135} type Single labelsize 11 hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
Fl_Input decl_before_input {
- tooltip {\#ifdef or similar conditional declaration block.} xywh {10 35 275 20} labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
+ tooltip {\#ifdef or similar conditional declaration block.} xywh {10 40 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
}
Fl_Input decl_after_input {
label {"\\n...child code...\\n" is inserted here}
- tooltip {\#endif or similar declaration code block.} xywh {10 74 275 20} labelsize 11 align 5 when 0 textfont 4 textsize 11
+ tooltip {\#endif or similar declaration code block.} xywh {10 75 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11
}
- Fl_Return_Button declblock_panel_ok {
- label OK
- xywh {169 99 55 20} labelsize 11 hotspot
+ Fl_Group {} {open
+ xywh {10 105 280 20}
+ } {
+ Fl_Return_Button declblock_panel_ok {
+ label OK
+ xywh {160 105 60 20} labelsize 11 hotspot
+ }
+ Fl_Button declblock_panel_cancel {
+ label Cancel
+ xywh {230 105 60 20} shortcut 0xff1b labelsize 11
+ }
+ Fl_Box {} {
+ xywh {10 105 140 20} resizable
+ }
}
- Fl_Button declblock_panel_cancel {
- label Cancel
- xywh {229 99 56 20} shortcut 0xff1b labelsize 11
+ Fl_Group {} {open
+ xywh {10 10 280 20}
+ } {
+ Fl_Light_Button declblock_public_button {
+ label public
+ tooltip {Make the declaration publicly accessible.} xywh {10 10 60 20} labelsize 11 when 0
+ }
+ Fl_Box {} {
+ xywh {80 10 210 20} resizable
+ }
}
- Fl_Light_Button declblock_public_button {
- label public
- tooltip {Make the declaration publicly accessible.} xywh {10 10 54 20} labelsize 11 when 0
- }
}
}
@@ -177,24 +202,39 @@
} {
Fl_Window decl_panel {
label {Declaration Properties}
- xywh {789 289 290 145} type Single hide resizable
+ xywh {412 206 290 150} type Single hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());}
} {
- Fl_Light_Button decl_public_button {
- label public
- tooltip {Make the declaration publicly accessible.} xywh {10 10 54 20} labelsize 11 when 0
+ Fl_Group {} {open
+ xywh {10 10 270 20}
+ } {
+ Fl_Light_Button decl_public_button {
+ label public
+ tooltip {Make the declaration publicly accessible.} xywh {10 10 60 20} labelsize 11 when 0
+ }
+ Fl_Box {} {
+ xywh {80 10 200 20} resizable
+ }
}
Fl_Input decl_input {
label {Can be any declaration, like "int x;", an external symbol like "extern int foo();", a \#directive like "\#include <foo.h>", a comment like "//foo" or "/*foo*/", or typedef like "typedef char byte;" or "using std::list;".}
- tooltip {Declaration text.} xywh {10 35 270 19} labelsize 11 align 134 when 0 textfont 4 textsize 11 resizable
+ tooltip {Declaration text.} xywh {10 40 270 20} labelsize 11 align 134 when 0 textfont 4 textsize 11 resizable
}
- Fl_Return_Button decl_panel_ok {
- label OK
- xywh {164 116 55 20} labelsize 11 hotspot
+ Fl_Group {} {open
+ xywh {10 120 270 20}
+ } {
+ Fl_Return_Button decl_panel_ok {
+ label OK
+ xywh {150 120 60 20} labelsize 11 hotspot
+ }
+ Fl_Button decl_panel_cancel {
+ label Cancel
+ xywh {220 120 60 20} shortcut 0xff1b labelsize 11
+ }
+ Fl_Box {} {
+ xywh {10 120 130 20} resizable
+ }
}
- Fl_Button decl_panel_cancel {
- label Cancel
- xywh {224 116 56 20} shortcut 0xff1b labelsize 11
- }
}
}
@@ -202,28 +242,43 @@
} {
Fl_Window class_panel {
label {Class Properties}
- xywh {744 223 285 140} type Single labelsize 11 hide resizable modal
+ xywh {449 218 300 140} type Single labelsize 11 hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
- Fl_Light_Button c_public_button {
- label public
- tooltip {Make the class publicly accessible.} xywh {10 10 54 20} labelsize 11 when 0
+ Fl_Group {} {open
+ xywh {10 10 280 20}
+ } {
+ Fl_Light_Button c_public_button {
+ label public
+ tooltip {Make the class publicly accessible.} xywh {10 10 60 20} labelsize 11 when 0
+ }
+ Fl_Box {} {
+ xywh {80 10 210 20} resizable
+ }
}
Fl_Input c_name_input {
label {Name:}
- tooltip {Name of class.} xywh {10 49 265 19} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
+ tooltip {Name of class.} xywh {10 45 280 20} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
}
Fl_Input c_subclass_input {
label {Subclass of (text between : and \{)}
- tooltip {Name of subclass.} xywh {10 87 265 19} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11
+ tooltip {Name of subclass.} xywh {10 80 280 20} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11
}
- Fl_Return_Button c_panel_ok {
- label OK
- xywh {159 111 55 20} labelsize 11 hotspot
+ Fl_Group {} {open
+ xywh {10 110 280 20}
+ } {
+ Fl_Return_Button c_panel_ok {
+ label OK
+ xywh {160 110 60 20} labelsize 11 hotspot
+ }
+ Fl_Button c_panel_cancel {
+ label Cancel
+ xywh {230 110 60 20} shortcut 0xff1b labelsize 11
+ }
+ Fl_Box {} {
+ xywh {10 110 140 20} resizable
+ }
}
- Fl_Button c_panel_cancel {
- label Cancel
- xywh {219 111 56 20} shortcut 0xff1b labelsize 11
- }
}
}
@@ -231,7 +286,8 @@
} {
Fl_Window comment_panel {
label {Comment Properties}
- xywh {422 190 552 282} type Single labelsize 11 hide resizable modal
+ xywh {422 190 552 282} type Single labelsize 11 hide resizable
+ code0 {o->size_range(320, 180);} modal
} {
Fl_Text_Editor comment_input {
xywh {110 10 430 230} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
@@ -290,16 +346,14 @@
} else {
undo_current --;
undo_last --;
- }} {selected
- }
+ }} {}
}
Function {make_widgetbin()} {open
} {
Fl_Window widgetbin_panel {
- label {Widget Bin}
- xywh {413 185 520 85} type Single hide
- code0 {o->size(520,87); // just to make sure...} non_modal
+ label {Widget Bin} selected
+ xywh {413 185 520 85} type Single hide non_modal
} {
Fl_Group {} {
xywh {3 3 79 79} box THIN_DOWN_BOX
Modified: branches/branch-1.1/fluid/widget_panel.cxx
===================================================================
--- branches/branch-1.1/fluid/widget_panel.cxx 2005-05-29 07:15:39 UTC (rev 4377)
+++ branches/branch-1.1/fluid/widget_panel.cxx 2005-05-29 22:28:13 UTC (rev 4378)
@@ -45,26 +45,26 @@
Fl_Double_Window* make_widget_panel() {
Fl_Double_Window* w;
- { Fl_Double_Window* o = new Fl_Double_Window(405, 345);
+ { Fl_Double_Window* o = new Fl_Double_Window(410, 355);
w = o;
o->labelsize(11);
w->hotspot(o);
- { Fl_Tabs* o = new Fl_Tabs(3, 5, 397, 310);
+ { Fl_Tabs* o = new Fl_Tabs(5, 5, 400, 310);
o->selection_color((Fl_Color)4);
o->labelsize(11);
o->callback((Fl_Callback*)cb_);
o->when(FL_WHEN_NEVER);
- { Fl_Group* o = new Fl_Group(3, 25, 396, 285, "GUI");
+ { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "GUI");
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
o->when(FL_WHEN_NEVER);
{ Fl_Group* o = new Fl_Group(3, 25, 396, 285);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Group* o = new Fl_Group(85, 25, 309, 30);
+ { Fl_Group* o = new Fl_Group(90, 35, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(85, 30, 199, 20, "Label:");
+ { Fl_Input* o = new Fl_Input(90, 35, 200, 20, "Label:");
o->tooltip("The label text for the widget.");
o->labelfont(1);
o->labelsize(11);
@@ -73,7 +73,7 @@
o->when(FL_WHEN_CHANGED);
Fl_Group::current()->resizable(o);
}
- { Fl_Choice* o = new Fl_Choice(285, 30, 109, 20);
+ { Fl_Choice* o = new Fl_Choice(290, 35, 100, 20);
o->tooltip("The label style for the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -84,10 +84,10 @@
}
o->end();
}
- { Fl_Group* o = new Fl_Group(85, 55, 310, 25);
+ { Fl_Group* o = new Fl_Group(90, 60, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(85, 55, 241, 20, "Image:");
+ { Fl_Input* o = new Fl_Input(90, 60, 230, 20, "Image:");
o->tooltip("The active image for the widget.");
o->labelfont(1);
o->labelsize(11);
@@ -95,17 +95,17 @@
o->callback((Fl_Callback*)image_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Button* o = new Fl_Button(325, 55, 70, 20, "Browse...");
+ { Fl_Button* o = new Fl_Button(320, 60, 70, 20, "Browse...");
o->tooltip("Click to choose the active image.");
o->labelsize(11);
o->callback((Fl_Callback*)image_browse_cb);
}
o->end();
}
- { Fl_Group* o = new Fl_Group(84, 80, 310, 25);
+ { Fl_Group* o = new Fl_Group(90, 85, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(85, 80, 240, 20, "Inactive:");
+ { Fl_Input* o = new Fl_Input(90, 85, 230, 20, "Inactive:");
o->tooltip("The inactive image for the widget.");
o->labelfont(1);
o->labelsize(11);
@@ -113,19 +113,19 @@
o->callback((Fl_Callback*)inactive_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Button* o = new Fl_Button(324, 80, 70, 20, "Browse...");
+ { Fl_Button* o = new Fl_Button(320, 85, 70, 20, "Browse...");
o->tooltip("Click to choose the inactive image.");
o->labelsize(11);
o->callback((Fl_Callback*)inactive_browse_cb);
}
o->end();
}
- { Fl_Group* o = new Fl_Group(85, 106, 309, 20, "Alignment:");
+ { Fl_Group* o = new Fl_Group(90, 110, 300, 20, "Alignment:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
o->align(FL_ALIGN_LEFT);
- { Fl_Button* o = new Fl_Button(85, 106, 40, 20, "Clip");
+ { Fl_Button* o = new Fl_Button(90, 110, 45, 20, "Clip");
o->tooltip("Clip the label to the inside of the widget.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -133,21 +133,21 @@
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
}
- { Fl_Button* o = new Fl_Button(130, 106, 45, 20, "Wrap");
+ { Fl_Button* o = new Fl_Button(140, 110, 50, 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 = new Fl_Button(180, 106, 69, 20, "Text/Image");
+ { Fl_Button* o = new Fl_Button(195, 110, 65, 20, "Text/Image");
o->tooltip("Show the label text over the image.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
o->labelsize(11);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TEXT_OVER_IMAGE));
}
- { Fl_Button* o = new Fl_Button(254, 106, 20, 20, "@-1<-");
+ { Fl_Button* o = new Fl_Button(265, 110, 20, 20, "@-1<-");
o->tooltip("Left-align the label.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -155,7 +155,7 @@
o->labelcolor(FL_INACTIVE_COLOR);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
}
- { Fl_Button* o = new Fl_Button(279, 106, 20, 20, "@-1->");
+ { Fl_Button* o = new Fl_Button(290, 110, 20, 20, "@-1->");
o->tooltip("Right-align the label.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -163,7 +163,7 @@
o->labelcolor(FL_INACTIVE_COLOR);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
}
- { Fl_Button* o = new Fl_Button(304, 106, 20, 20, "@-18");
+ { Fl_Button* o = new Fl_Button(315, 110, 20, 20, "@-18");
o->tooltip("Top-align the label.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -171,7 +171,7 @@
o->labelcolor(FL_INACTIVE_COLOR);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
}
- { Fl_Button* o = new Fl_Button(329, 106, 20, 20, "@-12");
+ { Fl_Button* o = new Fl_Button(340, 110, 20, 20, "@-12");
o->tooltip("Bottom-align the label.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -179,7 +179,7 @@
o->labelcolor(FL_INACTIVE_COLOR);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
}
- { Fl_Button* o = new Fl_Button(354, 106, 20, 20, "@-3square");
+ { Fl_Button* o = new Fl_Button(365, 110, 20, 20, "@-3square");
o->tooltip("Show the label inside the widget.");
o->type(1);
o->selection_color(FL_INACTIVE_COLOR);
@@ -187,96 +187,106 @@
o->labelcolor(FL_INACTIVE_COLOR);
o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
}
- { Fl_Box* o = new Fl_Box(379, 106, 15, 20);
+ { Fl_Box* o = new Fl_Box(390, 110, 0, 20);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
o->end();
}
- { Fl_Value_Input* o = widget_x_input = new Fl_Value_Input(85, 145, 60, 20, "X:");
- o->tooltip("The X position of the widget.");
- o->labelsize(11);
- o->maximum(2048);
- o->step(1);
- o->textsize(11);
- o->callback((Fl_Callback*)x_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Box* o = new Fl_Box(24, 145, 61, 20, "Position:");
+ { Fl_Group* o = new Fl_Group(90, 145, 300, 20, "Position:");
o->labelfont(1);
o->labelsize(11);
- o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+ o->callback((Fl_Callback*)propagate_load);
+ o->align(FL_ALIGN_LEFT);
+ { Fl_Value_Input* o = widget_x_input = new Fl_Value_Input(90, 145, 55, 20, "X:");
+ o->tooltip("The X position of the widget.");
+ o->labelsize(11);
+ o->maximum(2048);
+ o->step(1);
+ o->textsize(11);
+ o->callback((Fl_Callback*)x_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = widget_y_input = new Fl_Value_Input(150, 145, 55, 20, "Y:");
+ o->tooltip("The Y position of the widget.");
+ o->labelsize(11);
+ o->maximum(2048);
+ o->step(1);
+ o->textsize(11);
+ o->callback((Fl_Callback*)y_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = widget_w_input = new Fl_Value_Input(210, 145, 55, 20, "Width:");
+ o->tooltip("The width of the widget.");
+ o->labelsize(11);
+ o->maximum(2048);
+ o->step(1);
+ o->textsize(11);
+ o->callback((Fl_Callback*)w_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = widget_h_input = new Fl_Value_Input(270, 145, 55, 20, "Height:");
+ o->tooltip("The height of the widget.");
+ o->labelsize(11);
+ o->maximum(2048);
+ o->step(1);
+ o->textsize(11);
+ o->callback((Fl_Callback*)h_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Box* o = new Fl_Box(330, 145, 60, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Value_Input* o = widget_y_input = new Fl_Value_Input(149, 145, 60, 20, "Y:");
- o->tooltip("The Y position of the widget.");
- o->labelsize(11);
- o->maximum(2048);
- o->step(1);
- o->textsize(11);
- o->callback((Fl_Callback*)y_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = widget_w_input = new Fl_Value_Input(214, 145, 60, 20, "Width:");
- o->tooltip("The width of the widget.");
- o->labelsize(11);
- o->maximum(2048);
- o->step(1);
- o->textsize(11);
- o->callback((Fl_Callback*)w_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = widget_h_input = new Fl_Value_Input(279, 145, 60, 20, "Height:");
- o->tooltip("The height of the widget.");
- o->labelsize(11);
- o->maximum(2048);
- o->step(1);
- o->textsize(11);
- o->callback((Fl_Callback*)h_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Box* o = new Fl_Box(29, 185, 55, 20, "Values:");
+ { Fl_Group* o = new Fl_Group(90, 180, 300, 20, "Values:");
o->labelfont(1);
o->labelsize(11);
- o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+ o->callback((Fl_Callback*)propagate_load);
+ o->align(FL_ALIGN_LEFT);
+ { Fl_Value_Input* o = new Fl_Value_Input(90, 180, 55, 20, "Size:");
+ o->tooltip("The size of the slider.");
+ o->labelsize(11);
+ o->step(0.010101);
+ o->textsize(11);
+ o->callback((Fl_Callback*)slider_size_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = new Fl_Value_Input(150, 180, 55, 20, "Minimum:");
+ o->tooltip("The minimum value of the widget.");
+ o->labelsize(11);
+ o->textsize(11);
+ o->callback((Fl_Callback*)min_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = new Fl_Value_Input(210, 180, 55, 20, "Maximum:");
+ o->tooltip("The maximum value of the widget.");
+ o->labelsize(11);
+ o->value(1);
+ o->textsize(11);
+ o->callback((Fl_Callback*)max_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = new Fl_Value_Input(270, 180, 55, 20, "Step:");
+ o->tooltip("The resolution of the widget value.");
+ o->labelsize(11);
+ o->textsize(11);
+ o->callback((Fl_Callback*)step_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Value_Input* o = new Fl_Value_Input(330, 180, 55, 20, "Value:");
+ o->tooltip("The current widget value.");
+ o->labelsize(11);
+ o->textsize(11);
+ o->callback((Fl_Callback*)value_cb);
+ o->align(FL_ALIGN_TOP_LEFT);
+ }
+ { Fl_Box* o = new Fl_Box(390, 180, 0, 20);
+ Fl_Group::current()->resizable(o);
+ }
+ o->end();
}
- { Fl_Value_Input* o = new Fl_Value_Input(84, 185, 55, 20, "Size:");
- o->tooltip("The size of the slider.");
- o->labelsize(11);
- o->step(0.010101);
- o->textsize(11);
- o->callback((Fl_Callback*)slider_size_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = new Fl_Value_Input(144, 185, 55, 20, "Minimum:");
- o->tooltip("The minimum value of the widget.");
- o->labelsize(11);
- o->textsize(11);
- o->callback((Fl_Callback*)min_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = new Fl_Value_Input(204, 185, 55, 20, "Maximum:");
- o->tooltip("The maximum value of the widget.");
- o->labelsize(11);
- o->value(1);
- o->textsize(11);
- o->callback((Fl_Callback*)max_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = new Fl_Value_Input(264, 185, 55, 20, "Step:");
- o->tooltip("The resolution of the widget value.");
- o->labelsize(11);
- o->textsize(11);
- o->callback((Fl_Callback*)step_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Fl_Value_Input* o = new Fl_Value_Input(324, 185, 55, 20, "Value:");
- o->tooltip("The current widget value.");
- o->labelsize(11);
- o->textsize(11);
- o->callback((Fl_Callback*)value_cb);
- o->align(FL_ALIGN_TOP_LEFT);
- }
- { Shortcut_Button* o = new Shortcut_Button(84, 210, 308, 20, "Shortcut:");
+ { Shortcut_Button* o = new Shortcut_Button(90, 205, 300, 20, "Shortcut:");
o->tooltip("The shortcut key for the widget.");
o->box(FL_DOWN_BOX);
o->color(FL_BACKGROUND2_COLOR);
@@ -289,10 +299,10 @@
o->align(FL_ALIGN_LEFT);
o->when(FL_WHEN_RELEASE);
}
- { Fl_Group* o = new Fl_Group(87, 235, 305, 21);
+ { Fl_Group* o = new Fl_Group(90, 230, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(87, 236, 101, 20, "X Class:");
+ { Fl_Input* o = new Fl_Input(90, 230, 95, 20, "X Class:");
o->tooltip("The X resource class.");
o->labelfont(1);
o->labelsize(11);
@@ -300,19 +310,19 @@
o->callback((Fl_Callback*)xclass_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Light_Button* o = new Fl_Light_Button(193, 236, 59, 20, "Border");
+ { Fl_Light_Button* o = new Fl_Light_Button(190, 230, 60, 20, "Border");
o->tooltip("Add a border around the window.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)border_cb);
}
- { Fl_Light_Button* o = new Fl_Light_Button(257, 236, 55, 20, "Modal");
+ { Fl_Light_Button* o = new Fl_Light_Button(255, 230, 55, 20, "Modal");
o->tooltip("Make the window modal.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)modal_cb);
}
- { Fl_Light_Button* o = new Fl_Light_Button(317, 235, 75, 21, "Nonmodal");
+ { Fl_Light_Button* o = new Fl_Light_Button(315, 230, 75, 20, "Nonmodal");
o->tooltip("Make the window non-modal.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
@@ -321,54 +331,51 @@
}
o->end();
}
- { Fl_Group* o = new Fl_Group(87, 260, 307, 20);
+ { Fl_Group* o = new Fl_Group(87, 255, 307, 20, "Attributes:");
+ o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Light_Button* o = new Fl_Light_Button(87, 260, 57, 20, "Visible");
+ o->align(FL_ALIGN_LEFT);
+ { Fl_Light_Button* o = new Fl_Light_Button(90, 255, 60, 20, "Visible");
o->tooltip("Show the widget.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)visible_cb);
}
- { Fl_Box* o = new Fl_Box(87, 260, 6, 20, "Attributes:");
- o->labelfont(1);
- o->labelsize(11);
- o->align(FL_ALIGN_LEFT);
- }
- { Fl_Light_Button* o = new Fl_Light_Button(149, 260, 56, 20, "Active");
+ { Fl_Light_Button* o = new Fl_Light_Button(155, 255, 60, 20, "Active");
o->tooltip("Activate the widget.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)active_cb);
}
- { Fl_Light_Button* o = new Fl_Light_Button(210, 260, 74, 20, "Resizable");
+ { Fl_Light_Button* o = new Fl_Light_Button(220, 255, 75, 20, "Resizable");
o->tooltip("Make the widget resizable.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)resizable_cb);
o->when(FL_WHEN_CHANGED);
}
- { Fl_Light_Button* o = new Fl_Light_Button(289, 260, 64, 20, "Hotspot");
+ { Fl_Light_Button* o = new Fl_Light_Button(300, 255, 70, 20, "Hotspot");
o->tooltip("Center the window under this widget.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
o->callback((Fl_Callback*)hotspot_cb);
o->when(FL_WHEN_CHANGED);
}
- { Fl_Box* o = new Fl_Box(374, 260, 20, 20);
+ { Fl_Box* o = new Fl_Box(390, 255, 0, 20);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
o->end();
}
- { Fl_Input* o = new Fl_Input(87, 285, 307, 20, "Tooltip:");
+ { Fl_Input* o = new Fl_Input(90, 280, 300, 20, "Tooltip:");
o->tooltip("The tooltip text for the widget.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
o->callback((Fl_Callback*)tooltip_cb);
}
- { Fl_Box* o = new Fl_Box(89, 305, 305, 5);
+ { Fl_Box* o = new Fl_Box(90, 300, 300, 5);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
@@ -378,7 +385,7 @@
o->end();
Fl_Group::current()->resizable(o);
}
- { Fl_Group* o = new Fl_Group(3, 25, 397, 290, "Style");
+ { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "Style");
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
o->when(FL_WHEN_NEVER);
@@ -386,13 +393,13 @@
{ Fl_Group* o = new Fl_Group(3, 25, 396, 178);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Group* o = new Fl_Group(95, 30, 300, 100);
+ { Fl_Group* o = new Fl_Group(90, 35, 300, 95);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Group* o = new Fl_Group(95, 30, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 35, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Choice* o = new Fl_Choice(95, 30, 162, 20, "Label Font:");
+ { Fl_Choice* o = new Fl_Choice(90, 35, 160, 20, "Label Font:");
o->tooltip("The style of the label text.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -402,7 +409,7 @@
Fl_Group::current()->resizable(o);
o->menu(fontmenu);
}
- { Fl_Value_Input* o = new Fl_Value_Input(255, 30, 50, 20);
+ { Fl_Value_Input* o = new Fl_Value_Input(250, 35, 50, 20);
o->tooltip("The size of the label text.");
o->labelsize(11);
o->maximum(100);
@@ -411,17 +418,17 @@
o->textsize(11);
o->callback((Fl_Callback*)labelsize_cb);
}
- { Fl_Button* o = new Fl_Button(305, 30, 90, 20, "Label Color");
+ { Fl_Button* o = new Fl_Button(300, 35, 90, 20, "Label Color");
o->tooltip("The color of the label text.");
o->labelsize(11);
o->callback((Fl_Callback*)labelcolor_cb);
}
o->end();
}
- { Fl_Group* o = new Fl_Group(95, 55, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 60, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Choice* o = new Fl_Choice(95, 55, 210, 20, "Box:");
+ { Fl_Choice* o = new Fl_Choice(90, 60, 210, 20, "Box:");
o->tooltip("The \"up\" box of the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -431,17 +438,17 @@
Fl_Group::current()->resizable(o);
o->menu(boxmenu);
}
- { Fl_Button* o = new Fl_Button(305, 55, 90, 20, "Color");
+ { Fl_Button* o = new Fl_Button(300, 60, 90, 20, "Color");
o->tooltip("The background color of the widget.");
o->labelsize(11);
o->callback((Fl_Callback*)color_cb);
}
o->end();
}
- { Fl_Group* o = new Fl_Group(95, 80, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 85, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Choice* o = new Fl_Choice(95, 80, 210, 20, "Down Box:");
+ { Fl_Choice* o = new Fl_Choice(90, 85, 210, 20, "Down Box:");
o->tooltip("The \"down\" box of the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -451,17 +458,17 @@
Fl_Group::current()->resizable(o);
o->menu(boxmenu);
}
- { Fl_Button* o = new Fl_Button(305, 80, 90, 20, "Select Color");
+ { Fl_Button* o = new Fl_Button(300, 85, 90, 20, "Select Color");
o->tooltip("The selection color of the widget.");
o->labelsize(11);
o->callback((Fl_Callback*)color2_cb);
}
o->end();
}
- { Fl_Group* o = new Fl_Group(95, 105, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 110, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Choice* o = new Fl_Choice(95, 105, 160, 20, "Text Font:");
+ { Fl_Choice* o = new Fl_Choice(90, 110, 160, 20, "Text Font:");
o->tooltip("The value text style.");
o->box(FL_DOWN_BOX);
o->down_box(FL_BORDER_BOX);
@@ -471,7 +478,7 @@
Fl_Group::current()->resizable(o);
o->menu(fontmenu);
}
- { Fl_Value_Input* o = new Fl_Value_Input(255, 105, 50, 20);
+ { Fl_Value_Input* o = new Fl_Value_Input(250, 110, 50, 20);
o->tooltip("The value text size.");
o->labelsize(11);
o->maximum(100);
@@ -480,7 +487,7 @@
o->textsize(11);
o->callback((Fl_Callback*)textsize_cb);
}
- { Fl_Button* o = new Fl_Button(305, 105, 90, 20, "Text Color");
+ { Fl_Button* o = new Fl_Button(300, 110, 90, 20, "Text Color");
o->tooltip("The value text color.");
o->labelsize(11);
o->callback((Fl_Callback*)textcolor_cb);
@@ -489,7 +496,7 @@
}
o->end();
}
- { Fl_Box* o = new Fl_Box(95, 135, 295, 68);
+ { Fl_Box* o = new Fl_Box(90, 135, 300, 40);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
@@ -498,18 +505,18 @@
}
o->end();
}
- { Fl_Group* o = new Fl_Group(5, 25, 395, 290, "C++");
+ { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "C++");
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
o->when(FL_WHEN_NEVER);
o->hide();
- { Fl_Group* o = new Fl_Group(95, 30, 300, 137);
+ { Fl_Group* o = new Fl_Group(90, 35, 300, 130);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Group* o = new Fl_Group(95, 30, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 35, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(100, 30, 160, 20, "Class:");
+ { Fl_Input* o = new Fl_Input(90, 35, 160, 20, "Class:");
o->tooltip("The widget subclass.");
o->labelfont(1);
o->labelsize(11);
@@ -518,7 +525,7 @@
o->callback((Fl_Callback*)subclass_cb, (void*)(4));
Fl_Group::current()->resizable(o);
}
- { Fl_Choice* o = new Fl_Choice(260, 30, 135, 20);
+ { Fl_Choice* o = new Fl_Choice(250, 35, 140, 20);
o->tooltip("The widget subtype.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -527,10 +534,10 @@
}
o->end();
}
- { Fl_Group* o = new Fl_Group(95, 55, 300, 25);
+ { Fl_Group* o = new Fl_Group(90, 60, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(100, 55, 241, 20, "Name:");
+ { Fl_Input* o = new Fl_Input(90, 60, 240, 20, "Name:");
o->tooltip("The name of the widget.");
o->labelfont(1);
o->labelsize(11);
@@ -538,7 +545,7 @@
o->callback((Fl_Callback*)name_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Light_Button* o = new Fl_Light_Button(341, 55, 54, 20, "public");
+ { Fl_Light_Button* o = new Fl_Light_Button(330, 60, 60, 20, "public");
o->tooltip("Make the widget publicly accessible.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
@@ -547,7 +554,7 @@
}
o->end();
}
- { Fl_Input* o = v_input[0] = new Fl_Input(100, 80, 295, 20, "Extra Code:");
+ { Fl_Input* o = v_input[0] = new Fl_Input(90, 85, 300, 20, "Extra Code:");
o->tooltip("Extra initialization code for the widget.");
o->labelfont(1);
o->labelsize(11);
@@ -555,21 +562,21 @@
o->textsize(11);
o->callback((Fl_Callback*)v_input_cb, (void*)(0));
}
- { Fl_Input* o = v_input[1] = new Fl_Input(100, 100, 295, 20);
+ { Fl_Input* o = v_input[1] = new Fl_Input(90, 105, 300, 20);
o->tooltip("Extra initialization code for the widget.");
o->labelsize(11);
o->textfont(4);
o->textsize(11);
o->callback((Fl_Callback*)v_input_cb, (void*)(1));
}
- { Fl_Input* o = v_input[2] = new Fl_Input(100, 120, 295, 20);
+ { Fl_Input* o = v_input[2] = new Fl_Input(90, 125, 300, 20);
o->tooltip("Extra initialization code for the widget.");
o->labelsize(11);
o->textfont(4);
o->textsize(11);
o->callback((Fl_Callback*)v_input_cb, (void*)(2));
}
- { Fl_Input* o = v_input[3] = new Fl_Input(100, 142, 295, 20);
+ { Fl_Input* o = v_input[3] = new Fl_Input(90, 145, 300, 20);
o->tooltip("Extra initialization code for the widget.");
o->labelsize(11);
o->textfont(4);
@@ -578,7 +585,7 @@
}
o->end();
}
- { CodeEditor* o = new CodeEditor(100, 169, 295, 91, "Callback:");
+ { CodeEditor* o = new CodeEditor(90, 170, 300, 90, "Callback:");
o->tooltip("The callback function or code for the widget.");
o->box(FL_DOWN_BOX);
o->color(FL_BACKGROUND2_COLOR);
@@ -592,14 +599,15 @@
o->callback((Fl_Callback*)callback_cb);
o->align(FL_ALIGN_LEFT);
o->when(FL_WHEN_RELEASE);
+ Fl_Group::current()->resizable(o);
}
- { Fl_Group* o = new Fl_Group(95, 265, 303, 45);
+ { Fl_Group* o = new Fl_Group(90, 265, 300, 45);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Group* o = new Fl_Group(95, 265, 303, 20);
+ { Fl_Group* o = new Fl_Group(90, 265, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(100, 265, 140, 20, "User Data:");
+ { Fl_Input* o = new Fl_Input(90, 265, 140, 20, "User Data:");
o->tooltip("The user data to pass into the callback code.");
o->labelfont(1);
o->labelsize(11);
@@ -608,7 +616,7 @@
o->callback((Fl_Callback*)user_data_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Choice* o = new Fl_Choice(290, 265, 105, 20, "When:");
+ { Fl_Choice* o = new Fl_Choice(285, 265, 105, 20, "When:");
o->tooltip("When to call the callback function.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@@ -620,10 +628,10 @@
}
o->end();
}
- { Fl_Group* o = new Fl_Group(95, 290, 300, 20);
+ { Fl_Group* o = new Fl_Group(90, 290, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
- { Fl_Input* o = new Fl_Input(100, 290, 140, 20, "Type:");
+ { Fl_Input* o = new Fl_Input(90, 290, 140, 20, "Type:");
o->tooltip("The type of the user data.");
o->labelfont(1);
o->labelsize(11);
@@ -632,7 +640,7 @@
o->callback((Fl_Callback*)user_data_type_cb);
Fl_Group::current()->resizable(o);
}
- { Fl_Light_Button* o = new Fl_Light_Button(290, 290, 105, 20, "No Change");
+ { Fl_Light_Button* o = new Fl_Light_Button(285, 290, 105, 20, "No Change");
o->tooltip("Call the callback even if the value has not changed.");
o->selection_color((Fl_Color)1);
o->labelsize(11);
@@ -649,32 +657,33 @@
}
{ Fl_Group* o = new Fl_Group(8, 321, 391, 19);
o->labelsize(11);
- { Fl_Box* o = new Fl_Box(8, 330, 20, 0);
+ { Fl_Box* o = new Fl_Box(8, 325, 20, 20);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
- { Fl_Button* o = new Fl_Button(231, 321, 99, 19, "Hide &Overlays");
+ { Fl_Button* o = new Fl_Button(231, 325, 99, 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 = new Fl_Button(159, 330, 80, 0, "Revert");
+ { Fl_Button* o = new Fl_Button(159, 325, 80, 20, "Revert");
o->labelsize(11);
o->callback((Fl_Callback*)revert_cb);
o->hide();
}
- { Fl_Return_Button* o = new Fl_Return_Button(335, 321, 64, 19, "Close");
+ { Fl_Return_Button* o = new Fl_Return_Button(335, 325, 64, 20, "Close");
o->labelsize(11);
o->callback((Fl_Callback*)ok_cb);
}
- { Fl_Button* o = new Fl_Button(329, 330, 70, 0, "Cancel");
+ { Fl_Button* o = new Fl_Button(329, 325, 70, 20, "Cancel");
o->labelsize(11);
o->callback((Fl_Callback*)cancel_cb);
o->hide();
}
o->end();
}
+ o->size_range(o->w(), o->h());
o->end();
}
return w;
Modified: branches/branch-1.1/fluid/widget_panel.fl
===================================================================
--- branches/branch-1.1/fluid/widget_panel.fl 2005-05-29 07:15:39 UTC (rev 4377)
+++ branches/branch-1.1/fluid/widget_panel.fl 2005-05-29 22:28:13 UTC (rev 4378)
@@ -34,448 +34,456 @@
Function {make_widget_panel()} {open
} {
Fl_Window {} {open
- xywh {632 21 405 345} type Double labelsize 11 resizable hotspot visible
+ xywh {353 184 410 355} type Double labelsize 11 resizable hotspot
+ code0 {o->size_range(o->w(), o->h());} visible
} {
Fl_Tabs {} {
callback {propagate_load((Fl_Group *)o,v);} open
- xywh {3 5 397 310} selection_color 4 labelsize 11 when 0 resizable
+ xywh {5 5 400 310} selection_color 4 labelsize 11 when 0 resizable
} {
Fl_Group {} {
label GUI
callback propagate_load
- xywh {3 25 396 285} labelsize 11 when 0 resizable
+ xywh {5 25 400 290} labelsize 11 when 0 resizable
} {
Fl_Group {} {
- callback propagate_load open
+ callback propagate_load
xywh {3 25 396 285} labelsize 11 resizable
} {
Fl_Group {} {
- callback propagate_load open
- xywh {85 25 309 30} labelsize 11
+ callback propagate_load
+ xywh {90 35 300 20} labelsize 11
} {
Fl_Input {} {
label {Label:}
- callback label_cb
- tooltip {The label text for the widget.} xywh {85 30 199 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable
+ callback label_cb selected
+ tooltip {The label text for the widget.} xywh {90 35 200 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable
}
Fl_Choice {} {
callback labeltype_cb open
- tooltip {The label style for the widget.} xywh {285 30 109 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
+ tooltip {The label style for the widget.} xywh {290 35 100 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
code0 {extern Fl_Menu_Item labeltypemenu[];}
code1 {o->menu(labeltypemenu);}
} {}
}
Fl_Group {} {
- callback propagate_load open
- xywh {85 55 310 25} labelsize 11
+ callback propagate_load
+ xywh {90 60 300 20} labelsize 11
} {
Fl_Input {} {
label {Image:}
callback image_cb
- tooltip {The active image for the widget.} xywh {85 55 241 20} labelfont 1 labelsize 11 textsize 11 resizable
+ tooltip {The active image for the widget.} xywh {90 60 230 20} labelfont 1 labelsize 11 textsize 11 resizable
}
Fl_Button {} {
label {Browse...}
callback image_browse_cb
- tooltip {Click to choose the active image.} xywh {325 55 70 20} labelsize 11
+ tooltip {Click to choose the active image.} xywh {320 60 70 20} labelsize 11
}
}
Fl_Group {} {
- callback propagate_load open
- xywh {84 80 310 25} labelsize 11
+ callback propagate_load
+ xywh {90 85 300 20} labelsize 11
} {
Fl_Input {} {
label {Inactive:}
callback inactive_cb
- tooltip {The inactive image for the widget.} xywh {85 80 240 20} labelfont 1 labelsize 11 textsize 11 resizable
+ tooltip {The inactive image for the widget.} xywh {90 85 230 20} labelfont 1 labelsize 11 textsize 11 resizable
}
Fl_Button {} {
label {Browse...}
callback inactive_browse_cb
- tooltip {Click to choose the inactive image.} xywh {324 80 70 20} labelsize 11
+ tooltip {Click to choose the inactive image.} xywh {320 85 70 20} labelsize 11
}
}
Fl_Group {} {
label {Alignment:}
- callback propagate_load open
- xywh {85 106 309 20} labelfont 1 labelsize 11 align 4
+ callback propagate_load
+ xywh {90 110 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Button {} {
label Clip
user_data FL_ALIGN_CLIP
callback align_cb
- tooltip {Clip the label to the inside of the widget.} xywh {85 106 40 20} type Toggle selection_color 8 labelsize 11 align 16
+ tooltip {Clip the label to the inside of the widget.} xywh {90 110 45 20} type Toggle selection_color 8 labelsize 11 align 16
}
Fl_Button {} {
label Wrap
user_data FL_ALIGN_WRAP
callback align_cb
- tooltip {Wrap the label text.} xywh {130 106 45 20} type Toggle selection_color 8 labelsize 11
+ tooltip {Wrap the label text.} xywh {140 110 50 20} type Toggle selection_color 8 labelsize 11
}
Fl_Button {} {
label {Text/Image}
user_data FL_ALIGN_TEXT_OVER_IMAGE
callback align_cb
- tooltip {Show the label text over the image.} xywh {180 106 69 20} type Toggle selection_color 8 labelsize 11
+ tooltip {Show the label text over the image.} xywh {195 110 65 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 {254 106 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+ tooltip {Left-align the label.} xywh {265 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
}
Fl_Button {} {
label {@-1->}
user_data FL_ALIGN_RIGHT
callback align_cb
- tooltip {Right-align the label.} xywh {279 106 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+ tooltip {Right-align the label.} xywh {290 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
}
Fl_Button {} {
label {@-18}
user_data FL_ALIGN_TOP
callback align_cb
- tooltip {Top-align the label.} xywh {304 106 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+ tooltip {Top-align the label.} xywh {315 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
}
Fl_Button {} {
label {@-12}
user_data FL_ALIGN_BOTTOM
callback align_cb
- tooltip {Bottom-align the label.} xywh {329 106 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+ tooltip {Bottom-align the label.} xywh {340 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
}
Fl_Button {} {
label {@-3square}
user_data FL_ALIGN_INSIDE
callback align_cb
- tooltip {Show the label inside the widget.} xywh {354 106 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+ tooltip {Show the label inside the widget.} xywh {365 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
}
Fl_Box {} {
- xywh {379 106 15 20} labelsize 11 resizable
+ xywh {390 110 0 20} labelsize 11 resizable
}
}
- Fl_Value_Input widget_x_input {
- label {X:}
- callback x_cb
- tooltip {The X position of the widget.} xywh {85 145 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
- }
- Fl_Box {} {
+ Fl_Group {} {
label {Position:}
- xywh {24 145 61 20} labelfont 1 labelsize 11 align 24
+ callback propagate_load
+ xywh {90 145 300 20} labelfont 1 labelsize 11 align 4
+ } {
+ Fl_Value_Input widget_x_input {
+ label {X:}
+ callback x_cb
+ tooltip {The X position of the widget.} xywh {90 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
+ }
+ Fl_Value_Input widget_y_input {
+ label {Y:}
+ callback y_cb
+ tooltip {The Y position of the widget.} xywh {150 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
+ }
+ Fl_Value_Input widget_w_input {
+ label {Width:}
+ callback w_cb
+ tooltip {The width of the widget.} xywh {210 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
+ }
+ Fl_Value_Input widget_h_input {
+ label {Height:}
+ callback h_cb
+ tooltip {The height of the widget.} xywh {270 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
+ }
+ Fl_Box {} {
+ xywh {330 145 60 20} resizable
+ }
}
- Fl_Value_Input widget_y_input {
- label {Y:}
- callback y_cb
- tooltip {The Y position of the widget.} xywh {149 145 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
- }
- Fl_Value_Input widget_w_input {
- label {Width:}
- callback w_cb
- tooltip {The width of the widget.} xywh {214 145 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
- }
- Fl_Value_Input widget_h_input {
- label {Height:}
- callback h_cb
- tooltip {The height of the widget.} xywh {279 145 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
- }
- Fl_Box {} {
+ Fl_Group {} {
label {Values:}
- xywh {29 185 55 20} labelfont 1 labelsize 11 align 24
+ callback propagate_load
+ xywh {90 180 300 20} labelfont 1 labelsize 11 align 4
+ } {
+ Fl_Value_Input {} {
+ label {Size:}
+ callback slider_size_cb
+ tooltip {The size of the slider.} xywh {90 180 55 20} labelsize 11 align 5 step 0.010101 textsize 11
+ }
+ Fl_Value_Input {} {
+ label {Minimum:}
+ callback min_cb
+ tooltip {The minimum value of the widget.} xywh {150 180 55 20} labelsize 11 align 5 textsize 11
+ }
+ Fl_Value_Input {} {
+ label {Maximum:}
+ callback max_cb
+ tooltip {The maximum value of the widget.} xywh {210 180 55 20} labelsize 11 align 5 value 1 textsize 11
+ }
+ Fl_Value_Input {} {
+ label {Step:}
+ callback step_cb
+ tooltip {The resolution of the widget value.} xywh {270 180 55 20} labelsize 11 align 5 textsize 11
+ }
+ Fl_Value_Input {} {
+ label {Value:}
+ callback value_cb
+ tooltip {The current widget value.} xywh {330 180 55 20} labelsize 11 align 5 textsize 11
+ }
+ Fl_Box {} {
+ xywh {390 180 0 20} resizable
+ }
}
- Fl_Value_Input {} {
- label {Size:}
- callback slider_size_cb
- tooltip {The size of the slider.} xywh {84 185 55 20} labelsize 11 align 5 step 0.010101 textsize 11
- }
- Fl_Value_Input {} {
- label {Minimum:}
- callback min_cb
- tooltip {The minimum value of the widget.} xywh {144 185 55 20} labelsize 11 align 5 textsize 11
- }
- Fl_Value_Input {} {
- label {Maximum:}
- callback max_cb
- tooltip {The maximum value of the widget.} xywh {204 185 55 20} labelsize 11 align 5 value 1 textsize 11
- }
- Fl_Value_Input {} {
- label {Step:}
- callback step_cb
- tooltip {The resolution of the widget value.} xywh {264 185 55 20} labelsize 11 align 5 textsize 11
- }
- Fl_Value_Input {} {
- label {Value:}
- callback value_cb
- tooltip {The current widget value.} xywh {324 185 55 20} labelsize 11 align 5 textsize 11
- }
Fl_Button {} {
label {Shortcut:}
callback shortcut_in_cb
- tooltip {The shortcut key for the widget.} xywh {84 210 308 20} box DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4
+ tooltip {The shortcut key for the widget.} xywh {90 205 300 20} box DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4
code0 {\#include "Shortcut_Button.h"}
class Shortcut_Button
}
Fl_Group {} {
- callback propagate_load open
- xywh {87 235 305 21} labelsize 11
+ callback propagate_load
+ xywh {90 230 300 20} labelsize 11
} {
Fl_Input {} {
label {X Class:}
callback xclass_cb
- tooltip {The X resource class.} xywh {87 236 101 20} labelfont 1 labelsize 11 textsize 11 resizable
+ tooltip {The X resource class.} xywh {90 230 95 20} labelfont 1 labelsize 11 textsize 11 resizable
}
Fl_Light_Button {} {
label Border
callback border_cb
- tooltip {Add a border around the window.} xywh {193 236 59 20} selection_color 1 labelsize 11
+ tooltip {Add a border around the window.} xywh {190 230 60 20} selection_color 1 labelsize 11
}
Fl_Light_Button {} {
label Modal
callback modal_cb
- tooltip {Make the window modal.} xywh {257 236 55 20} selection_color 1 labelsize 11
+ tooltip {Make the window modal.} xywh {255 230 55 20} selection_color 1 labelsize 11
}
Fl_Light_Button {} {
label Nonmodal
callback non_modal_cb
- tooltip {Make the window non-modal.} xywh {317 235 75 21} selection_color 1 labelsize 11 align 148
+ tooltip {Make the window non-modal.} xywh {315 230 75 20} selection_color 1 labelsize 11 align 148
}
}
Fl_Group {} {
- callback propagate_load open
- xywh {87 260 307 20} labelsize 11
+ label {Attributes:}
+ callback propagate_load
+ xywh {87 255 307 20} labelfont 1 labelsize 11 align 4
} {
Fl_Light_Button {} {
label Visible
callback visible_cb
- tooltip {Show the widget.} xywh {87 260 57 20} selection_color 1 labelsize 11
+ tooltip {Show the widget.} xywh {90 255 60 20} selection_color 1 labelsize 11
}
- Fl_Box {} {
- label {Attributes:}
- xywh {87 260 6 20} labelfont 1 labelsize 11 align 4
- }
Fl_Light_Button {} {
label Active
callback active_cb
- tooltip {Activate the widget.} xywh {149 260 56 20} selection_color 1 labelsize 11
+ tooltip {Activate the widget.} xywh {155 255 60 20} selection_color 1 labelsize 11
}
Fl_Light_Button {} {
label Resizable
callback resizable_cb
- tooltip {Make the widget resizable.} xywh {210 260 74 20} selection_color 1 labelsize 11 when 1
+ tooltip {Make the widget resizable.} xywh {220 255 75 20} selection_color 1 labelsize 11 when 1
}
Fl_Light_Button {} {
label Hotspot
callback hotspot_cb
- tooltip {Center the window under this widget.} xywh {289 260 64 20} selection_color 1 labelsize 11 when 1
+ tooltip {Center the window under this widget.} xywh {300 255 70 20} selection_color 1 labelsize 11 when 1
}
Fl_Box {} {
- xywh {374 260 20 20} labelsize 11 resizable
+ xywh {390 255 0 20} labelsize 11 resizable
}
}
Fl_Input {} {
label {Tooltip:}
callback tooltip_cb
- tooltip {The tooltip text for the widget.} xywh {87 285 307 20} labelfont 1 labelsize 11 textsize 11
+ tooltip {The tooltip text for the widget.} xywh {90 280 300 20} labelfont 1 labelsize 11 textsize 11
}
Fl_Box {} {
- xywh {89 305 305 5} labelsize 11 resizable
+ xywh {90 300 300 5} labelsize 11 resizable
}
}
}
Fl_Group {} {
label Style
callback propagate_load
- xywh {3 25 397 290} labelsize 11 when 0 hide
+ xywh {5 25 400 290} labelsize 11 when 0 hide
} {
Fl_Group {} {
- callback propagate_load open
+ callback propagate_load
xywh {3 25 396 178} labelsize 11 resizable
} {
Fl_Group {} {
- callback propagate_load open
- xywh {95 30 300 100} labelsize 11
+ callback propagate_load
+ xywh {90 35 300 95} labelsize 11
} {
Fl_Group {} {
- callback propagate_load open
- xywh {95 30 300 25} labelsize 11
+ callback propagate_load
+ xywh {90 35 300 20} labelsize 11
} {
Fl_Choice {} {
label {Label Font:}
callback labelfont_cb open
- tooltip {The style of the label text.} xywh {95 30 162 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
+ tooltip {The style of the label text.} xywh {90 35 160 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
code0 {extern Fl_Menu_Item fontmenu[];}
code1 {o->menu(fontmenu);}
} {}
Fl_Value_Input {} {
callback labelsize_cb
- tooltip {The size of the label text.} xywh {255 30 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
+ tooltip {The size of the label text.} xywh {250 35 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
}
Fl_Button {} {
label {Label Color}
callback labelcolor_cb
- tooltip {The color of the label text.} xywh {305 30 90 20} labelsize 11
+ tooltip {The color of the label text.} xywh {300 35 90 20} labelsize 11
}
}
Fl_Group {} {
- callback propagate_load open
- xywh {95 55 300 25} labelsize 11
+ callback propagate_load
+ xywh {90 60 300 20} labelsize 11
} {
Fl_Choice {} {
label {Box:}
callback box_cb open
- tooltip {The "up" box of the widget.} xywh {95 55 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
+ tooltip {The "up" box of the widget.} xywh {90 60 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
code0 {extern Fl_Menu_Item boxmenu[];}
code1 {o->menu(boxmenu);}
} {}
Fl_Button {} {
label Color
callback color_cb
- tooltip {The background color of the widget.} xywh {305 55 90 20} labelsize 11
+ tooltip {The background color of the widget.} xywh {300 60 90 20} labelsize 11
}
}
Fl_Group {} {
- callback propagate_load open
- xywh {95 80 300 25} labelsize 11
+ callback propagate_load
+ xywh {90 85 300 20} labelsize 11
} {
Fl_Choice {} {
label {Down Box:}
callback down_box_cb open
- tooltip {The "down" box of the widget.} xywh {95 80 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
+ tooltip {The "down" box of the widget.} xywh {90 85 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
code0 {extern Fl_Menu_Item boxmenu[];}
code1 {o->menu(boxmenu);}
} {}
Fl_Button {} {
label {Select Color}
callback color2_cb
- tooltip {The selection color of the widget.} xywh {305 80 90 20} labelsize 11
+ tooltip {The selection color of the widget.} xywh {300 85 90 20} labelsize 11
}
}
Fl_Group {} {
- callback propagate_load open
- xywh {95 105 300 25} labelsize 11
+ callback propagate_load
+ xywh {90 110 300 20} labelsize 11
} {
Fl_Choice {} {
label {Text Font:}
callback textfont_cb open
- tooltip {The value text style.} xywh {95 105 160 20} box DOWN_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
+ tooltip {The value text style.} xywh {90 110 160 20} box DOWN_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
code0 {extern Fl_Menu_Item fontmenu[];}
code1 {o->menu(fontmenu);}
} {}
Fl_Value_Input {} {
callback textsize_cb
- tooltip {The value text size.} xywh {255 105 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
+ tooltip {The value text size.} xywh {250 110 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
}
Fl_Button {} {
label {Text Color}
callback textcolor_cb
- tooltip {The value text color.} xywh {305 105 90 20} labelsize 11
+ tooltip {The value text color.} xywh {300 110 90 20} labelsize 11
}
}
}
Fl_Box {} {
- xywh {95 135 295 68} labelsize 11 resizable
+ xywh {90 135 300 40} labelsize 11 resizable
}
}
}
Fl_Group {} {
label {C++}
- callback propagate_load open
- xywh {5 25 395 290} labelsize 11 when 0 hide
+ callback propagate_load
+ xywh {5 25 400 290} labelsize 11 when 0 hide
} {
Fl_Group {} {
- callback propagate_load open
- xywh {95 30 300 137} labelsize 11
+ callback propagate_load
+ xywh {90 35 300 130} labelsize 11
} {
Fl_Group {} {
callback propagate_load open
- xywh {95 30 300 25} labelsize 11
+ xywh {90 35 300 20} labelsize 11
} {
Fl_Input {} {
label {Class:}
user_data 4
callback subclass_cb
- tooltip {The widget subclass.} xywh {100 30 160 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
+ tooltip {The widget subclass.} xywh {90 35 160 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
Fl_Choice {} {
callback subtype_cb open
- tooltip {The widget subtype.} xywh {260 30 135 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11
+ tooltip {The widget subtype.} xywh {250 35 140 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11
} {}
}
Fl_Group {} {
callback propagate_load open
- xywh {95 55 300 25} labelsize 11
+ xywh {90 60 300 20} labelsize 11
} {
Fl_Input {} {
label {Name:}
callback name_cb
- tooltip {The name of the widget.} xywh {100 55 241 20} labelfont 1 labelsize 11 textsize 11 resizable
+ tooltip {The name of the widget.} xywh {90 60 240 20} labelfont 1 labelsize 11 textsize 11 resizable
}
Fl_Light_Button {} {
label public
callback name_public_cb
- tooltip {Make the widget publicly accessible.} xywh {341 55 54 20} selection_color 1 labelsize 11 when 1
+ tooltip {Make the widget publicly accessible.} xywh {330 60 60 20} selection_color 1 labelsize 11 when 1
}
}
Fl_Input {v_input[0]} {
label {Extra Code:}
user_data 0
callback v_input_cb
- tooltip {Extra initialization code for the widget.} xywh {100 80 295 20} labelfont 1 labelsize 11 textfont 4 textsize 11
+ tooltip {Extra initialization code for the widget.} xywh {90 85 300 20} labelfont 1 labelsize 11 textfont 4 textsize 11
}
Fl_Input {v_input[1]} {
user_data 1
callback v_input_cb
- tooltip {Extra initialization code for the widget.} xywh {100 100 295 20} labelsize 11 textfont 4 textsize 11
+ tooltip {Extra initialization code for the widget.} xywh {90 105 300 20} labelsize 11 textfont 4 textsize 11
}
Fl_Input {v_input[2]} {
user_data 2
callback v_input_cb
- tooltip {Extra initialization code for the widget.} xywh {100 120 295 20} labelsize 11 textfont 4 textsize 11
+ tooltip {Extra initialization code for the widget.} xywh {90 125 300 20} labelsize 11 textfont 4 textsize 11
}
Fl_Input {v_input[3]} {
user_data 3
callback v_input_cb
- tooltip {Extra initialization code for the widget.} xywh {100 142 295 20} labelsize 11 textfont 4 textsize 11
+ tooltip {Extra initialization code for the widget.} xywh {90 145 300 20} labelsize 11 textfont 4 textsize 11
}
}
Fl_Text_Editor {} {
label {Callback:}
callback callback_cb
- tooltip {The callback function or code for the widget.} xywh {100 169 295 91} box DOWN_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11
+ tooltip {The callback function or code for the widget.} xywh {90 170 300 90} box DOWN_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11 resizable
code0 {\#include "CodeEditor.h"}
class CodeEditor
}
Fl_Group {} {
callback propagate_load open
- xywh {95 265 303 45} labelsize 11
+ xywh {90 265 300 45} labelsize 11
} {
Fl_Group {} {
callback propagate_load open
- xywh {95 265 303 20} labelsize 11
+ xywh {90 265 300 20} labelsize 11
} {
Fl_Input {} {
label {User Data:}
callback user_data_cb
- tooltip {The user data to pass into the callback code.} xywh {100 265 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
+ tooltip {The user data to pass into the callback code.} xywh {90 265 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
Fl_Choice {} {
label {When:}
callback when_cb open
- tooltip {When to call the callback function.} xywh {290 265 105 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1
+ tooltip {When to call the callback function.} xywh {285 265 105 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1
code0 {extern Fl_Menu_Item whenmenu[];}
code1 {o->menu(whenmenu);}
} {}
}
Fl_Group {} {
callback propagate_load open
- xywh {95 290 300 20} labelsize 11
+ xywh {90 290 300 20} labelsize 11
} {
Fl_Input {} {
label {Type:}
callback user_data_type_cb
- tooltip {The type of the user data.} xywh {100 290 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
+ tooltip {The type of the user data.} xywh {90 290 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
Fl_Light_Button {} {
label {No Change}
callback when_button_cb
- tooltip {Call the callback even if the value has not changed.} xywh {290 290 105 20} selection_color 1 labelsize 11
+ tooltip {Call the callback even if the value has not changed.} xywh {285 290 105 20} selection_color 1 labelsize 11
}
}
}
@@ -485,27 +493,27 @@
xywh {8 321 391 19} labelsize 11
} {
Fl_Box {} {
- xywh {8 330 20 0} labelsize 11 resizable
+ xywh {8 325 20 20} labelsize 11 resizable
}
Fl_Button {} {
label {Hide &Overlays}
- callback overlay_cb selected
- tooltip {Hide the widget overlay box.} xywh {231 321 99 19} labelsize 11 labelcolor 1
+ callback overlay_cb
+ tooltip {Hide the widget overlay box.} xywh {231 325 99 20} labelsize 11 labelcolor 1
}
Fl_Button {} {
label Revert
callback revert_cb
- xywh {159 330 80 0} labelsize 11 hide
+ xywh {159 325 80 20} labelsize 11 hide
}
Fl_Return_Button {} {
label Close
callback ok_cb
- xywh {335 321 64 19} labelsize 11
+ xywh {335 325 64 20} labelsize 11
}
Fl_Button {} {
label Cancel
callback cancel_cb
- xywh {329 330 70 0} labelsize 11 hide
+ xywh {329 325 70 20} labelsize 11 hide
}
}
}
[ Direct Link to Message ] | |
