mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#959: outside labels in fluid moved, so that they refresh correctly even when previously clipped. Remove superfluous grouping. Using contrasting color for label of selected Tabs. MUST GET 1.1.7 OUT SOON! ;-)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2005-08-17 11:33:12 +00:00
parent c9bfdc20fc
commit 6bd434fe47
3 changed files with 991 additions and 1015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #571, STR #648, STR #692, STR
#730, STR #744, STR #745, STR #931, STR #942, STR #960,
STR #969)
- FLUID group labels redraw correctly (STR #959)
- FLUID now updates color of Fl_Tabs children (STR #979)
- FLUID now supports 'size_range()' (STR #851)
- FLUID selection boxes now synchronised (STR #964)

109
fluid/widget_panel.cxx
View File

@ -51,22 +51,22 @@ Fl_Double_Window* make_widget_panel() {
w = o;
o->labelsize(11);
w->hotspot(o);
{ Fl_Tabs* o = new Fl_Tabs(3, 5, 402, 310);
{ Fl_Tabs* o = new Fl_Tabs(5, 5, 400, 310);
o->selection_color((Fl_Color)4);
o->labelsize(11);
o->labelcolor(FL_BACKGROUND2_COLOR);
o->callback((Fl_Callback*)cb_);
o->when(FL_WHEN_NEVER);
{ Fl_Group* o = new Fl_Group(3, 25, 402, 290, "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);
{ Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Label:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ 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(90, 35, 180, 20, "Label:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 35, 180, 20);
o->tooltip("The label text for the widget.");
o->labelfont(1);
o->labelsize(11);
@ -79,6 +79,7 @@ Fl_Double_Window* make_widget_panel() {
o->tooltip("The label style for the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
o->callback((Fl_Callback*)labeltype_cb);
@ -86,10 +87,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Image:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Input* o = new Fl_Input(90, 60, 230, 20, "Image:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 60, 230, 20);
o->tooltip("The active image for the widget.");
o->labelfont(1);
o->labelsize(11);
@ -104,10 +107,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 85, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 85, 300, 20, "Inactive:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Input* o = new Fl_Input(90, 85, 230, 20, "Inactive:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 85, 230, 20);
o->tooltip("The inactive image for the widget.");
o->labelfont(1);
o->labelsize(11);
@ -356,10 +361,12 @@ Fl_Double_Window* make_widget_panel() {
o->align(FL_ALIGN_LEFT);
o->when(FL_WHEN_RELEASE);
}
{ Fl_Group* o = new Fl_Group(90, 230, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 230, 300, 20, "X Class:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Input* o = new Fl_Input(90, 230, 95, 20, "X Class:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 230, 95, 20, ":");
o->tooltip("The X resource class.");
o->labelfont(1);
o->labelsize(11);
@ -388,7 +395,7 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(87, 255, 307, 20, "Attributes:");
{ Fl_Group* o = new Fl_Group(90, 255, 305, 20, "Attributes:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
@ -439,24 +446,17 @@ Fl_Double_Window* make_widget_panel() {
o->end();
Fl_Group::current()->resizable(o);
}
o->end();
Fl_Group::current()->resizable(o);
}
{ Fl_Group* o = new Fl_Group(3, 25, 402, 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);
o->hide();
{ Fl_Group* o = new Fl_Group(3, 25, 396, 178);
{ Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Label Font:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ 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(90, 35, 300, 20);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Choice* o = new Fl_Choice(90, 35, 160, 20, "Label Font:");
o->align(FL_ALIGN_LEFT);
{ Fl_Choice* o = new Fl_Choice(90, 35, 160, 20);
o->tooltip("The style of the label text.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@ -482,10 +482,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Box:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Choice* o = new Fl_Choice(90, 60, 210, 20, "Box:");
o->align(FL_ALIGN_LEFT);
{ Fl_Choice* o = new Fl_Choice(90, 60, 210, 20);
o->tooltip("The \"up\" box of the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@ -502,10 +504,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 85, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 85, 300, 20, "Down Box:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Choice* o = new Fl_Choice(90, 85, 210, 20, "Down Box:");
o->align(FL_ALIGN_LEFT);
{ Fl_Choice* o = new Fl_Choice(90, 85, 210, 20);
o->tooltip("The \"down\" box of the widget.");
o->box(FL_THIN_UP_BOX);
o->down_box(FL_BORDER_BOX);
@ -522,10 +526,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 110, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 110, 300, 20, "Text Font:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Choice* o = new Fl_Choice(90, 110, 160, 20, "Text Font:");
o->align(FL_ALIGN_LEFT);
{ Fl_Choice* o = new Fl_Choice(90, 110, 160, 20);
o->tooltip("The value text style.");
o->box(FL_DOWN_BOX);
o->down_box(FL_BORDER_BOX);
@ -551,29 +557,23 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
o->end();
}
{ Fl_Box* o = new Fl_Box(90, 135, 300, 40);
o->labelsize(11);
Fl_Group::current()->resizable(o);
}
o->end();
Fl_Group::current()->resizable(o);
}
o->end();
}
{ 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(90, 35, 300, 130);
{ Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Class:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ 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(90, 35, 160, 20, "Class:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 35, 160, 20);
o->tooltip("The widget subclass.");
o->labelfont(1);
o->labelsize(11);
@ -591,10 +591,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Name:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Input* o = new Fl_Input(90, 60, 240, 20, "Name:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 60, 240, 20);
o->tooltip("The name of the widget.");
o->labelfont(1);
o->labelsize(11);
@ -640,8 +642,6 @@ Fl_Double_Window* make_widget_panel() {
o->textsize(11);
o->callback((Fl_Callback*)v_input_cb, (void*)(3));
}
o->end();
}
{ CodeEditor* o = new CodeEditor(90, 170, 300, 90, "Callback:");
o->tooltip("The callback function or code for the widget.");
o->box(FL_DOWN_BOX);
@ -658,13 +658,12 @@ Fl_Double_Window* make_widget_panel() {
o->when(FL_WHEN_RELEASE);
Fl_Group::current()->resizable(o);
}
{ Fl_Group* o = new Fl_Group(90, 265, 300, 45);
{ Fl_Group* o = new Fl_Group(90, 265, 300, 20, "User Data:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ 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(90, 265, 140, 20, "User Data:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 265, 140, 20);
o->tooltip("The user data to pass into the callback code.");
o->labelfont(1);
o->labelsize(11);
@ -685,10 +684,12 @@ Fl_Double_Window* make_widget_panel() {
}
o->end();
}
{ Fl_Group* o = new Fl_Group(90, 290, 300, 20);
{ Fl_Group* o = new Fl_Group(90, 290, 300, 20, "Type:");
o->labelfont(1);
o->labelsize(11);
o->callback((Fl_Callback*)propagate_load);
{ Fl_Input* o = new Fl_Input(90, 290, 140, 20, "Type:");
o->align(FL_ALIGN_LEFT);
{ Fl_Input* o = new Fl_Input(90, 290, 140, 20);
o->tooltip("The type of the user data.");
o->labelfont(1);
o->labelsize(11);
@ -708,8 +709,6 @@ Fl_Double_Window* make_widget_panel() {
o->end();
}
o->end();
}
o->end();
Fl_Group::current()->resizable(o);
}
{ Fl_Group* o = new Fl_Group(8, 321, 391, 24);

102
fluid/widget_panel.fl
View File

@ -39,39 +39,35 @@ Function {make_widget_panel()} {open
} {
Fl_Tabs {} {
callback {propagate_load((Fl_Group *)o,v);} open
xywh {3 5 402 310} selection_color 4 labelsize 11 when 0 resizable
xywh {5 5 400 310} selection_color 4 labelsize 11 labelcolor 7 when 0 resizable
} {
Fl_Group {} {
label GUI
callback propagate_load open
xywh {3 25 402 290} labelsize 11 when 0 resizable
} {
Fl_Group {} {
callback propagate_load open
xywh {3 25 396 285} labelsize 11 resizable
callback propagate_load selected
xywh {5 25 400 290} labelsize 11 when 0 resizable
} {
Fl_Group {} {
label {Label:}
callback propagate_load
xywh {90 35 300 20} labelsize 11
xywh {90 35 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Label:}
callback label_cb
tooltip {The label text for the widget.} xywh {90 35 180 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable
}
Fl_Choice {} {
callback labeltype_cb open
tooltip {The label style for the widget.} xywh {270 35 120 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
tooltip {The label style for the widget.} xywh {270 35 120 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
code0 {extern Fl_Menu_Item labeltypemenu[];}
code1 {o->menu(labeltypemenu);}
} {}
}
Fl_Group {} {
label {Image:}
callback propagate_load
xywh {90 60 300 20} labelsize 11
xywh {90 60 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Image:}
callback image_cb
tooltip {The active image for the widget.} xywh {90 60 230 20} labelfont 1 labelsize 11 textsize 11 resizable
}
@ -82,11 +78,11 @@ Function {make_widget_panel()} {open
}
}
Fl_Group {} {
label {Inactive:}
callback propagate_load
xywh {90 85 300 20} labelsize 11
xywh {90 85 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Inactive:}
callback inactive_cb
tooltip {The inactive image for the widget.} xywh {90 85 230 20} labelfont 1 labelsize 11 textsize 11 resizable
}
@ -184,7 +180,7 @@ Function {make_widget_panel()} {open
}
Fl_Group {} {
label {Values:}
callback propagate_load selected
callback propagate_load
xywh {90 180 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Value_Input {} {
@ -261,11 +257,12 @@ Function {make_widget_panel()} {open
class Shortcut_Button
}
Fl_Group {} {
label {X Class:}
callback propagate_load
xywh {90 230 300 20} labelsize 11
xywh {90 230 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {X Class:}
label {:}
callback xclass_cb
tooltip {The X resource class.} xywh {90 230 95 20} labelfont 1 labelsize 11 textsize 11 resizable
}
@ -288,7 +285,7 @@ Function {make_widget_panel()} {open
Fl_Group {} {
label {Attributes:}
callback propagate_load
xywh {87 255 307 20} labelfont 1 labelsize 11 align 4
xywh {90 255 305 20} labelfont 1 labelsize 11 align 4
} {
Fl_Light_Button {} {
label Visible
@ -323,26 +320,17 @@ Function {make_widget_panel()} {open
xywh {90 300 300 5} labelsize 11 resizable
}
}
}
Fl_Group {} {
label Style
callback propagate_load
xywh {3 25 402 290} labelsize 11 when 0 hide
xywh {5 25 400 290} labelsize 11 when 0 hide
} {
Fl_Group {} {
callback propagate_load
xywh {3 25 396 178} labelsize 11 resizable
} {
Fl_Group {} {
callback propagate_load
xywh {90 35 300 95} labelsize 11
} {
Fl_Group {} {
callback propagate_load
xywh {90 35 300 20} labelsize 11
label {Label Font:}
callback propagate_load open
xywh {90 35 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Choice {} {
label {Label Font:}
callback labelfont_cb open
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[];}
@ -359,11 +347,11 @@ Function {make_widget_panel()} {open
}
}
Fl_Group {} {
callback propagate_load
xywh {90 60 300 20} labelsize 11
label {Box:}
callback propagate_load open
xywh {90 60 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Choice {} {
label {Box:}
callback box_cb open
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[];}
@ -376,11 +364,11 @@ Function {make_widget_panel()} {open
}
}
Fl_Group {} {
callback propagate_load
xywh {90 85 300 20} labelsize 11
label {Down Box:}
callback propagate_load open
xywh {90 85 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Choice {} {
label {Down Box:}
callback down_box_cb open
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[];}
@ -393,11 +381,11 @@ Function {make_widget_panel()} {open
}
}
Fl_Group {} {
callback propagate_load
xywh {90 110 300 20} labelsize 11
label {Text Font:}
callback propagate_load open
xywh {90 110 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Choice {} {
label {Text Font:}
callback textfont_cb open
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[];}
@ -413,27 +401,21 @@ Function {make_widget_panel()} {open
tooltip {The value text color.} xywh {300 110 90 20} labelsize 11
}
}
}
Fl_Box {} {
xywh {90 135 300 40} labelsize 11 resizable
}
}
}
Fl_Group {} {
label {C++}
callback propagate_load
xywh {5 25 400 290} labelsize 11 when 0 hide
} {
Fl_Group {} {
label {Class:}
callback propagate_load
xywh {90 35 300 130} labelsize 11
} {
Fl_Group {} {
callback propagate_load open
xywh {90 35 300 20} labelsize 11
xywh {90 35 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Class:}
user_data 4
callback subclass_cb
tooltip {The widget subclass.} xywh {90 35 160 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
@ -444,11 +426,11 @@ Function {make_widget_panel()} {open
} {}
}
Fl_Group {} {
callback propagate_load open
xywh {90 60 300 20} labelsize 11
label {Name:}
callback propagate_load
xywh {90 60 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Name:}
callback name_cb
tooltip {The name of the widget.} xywh {90 60 240 20} labelfont 1 labelsize 11 textsize 11 resizable
}
@ -479,7 +461,6 @@ Function {make_widget_panel()} {open
callback v_input_cb
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
@ -488,15 +469,11 @@ Function {make_widget_panel()} {open
class CodeEditor
}
Fl_Group {} {
callback propagate_load open
xywh {90 265 300 45} labelsize 11
} {
Fl_Group {} {
callback propagate_load open
xywh {90 265 300 20} labelsize 11
label {User Data:}
callback propagate_load
xywh {90 265 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {User Data:}
callback user_data_cb
tooltip {The user data to pass into the callback code.} xywh {90 265 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
@ -509,11 +486,11 @@ Function {make_widget_panel()} {open
} {}
}
Fl_Group {} {
callback propagate_load open
xywh {90 290 300 20} labelsize 11
label {Type:}
callback propagate_load
xywh {90 290 300 20} labelfont 1 labelsize 11 align 4
} {
Fl_Input {} {
label {Type:}
callback user_data_type_cb
tooltip {The type of the user data.} xywh {90 290 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
@ -525,7 +502,6 @@ Function {make_widget_panel()} {open
}
}
}
}
Fl_Group {} {
xywh {8 321 391 24} labelsize 11
} {