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

Bring over combined fix [r12044] from 1.3 current to the porting branch.

Browse Source 
Applied patch from STR #3335 to fix simple GUI issues.
 


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano 2016-10-17 19:20:36 +00:00
parent de4572ffdd
commit 43c98c7c90
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fluid/fluid.cxx
View File

@ -610,6 +610,11 @@ void new_cb(Fl_Widget *, void *v) {
template_panel->label("New"); template_panel->label("New");
if ( template_browser->size() == 1 ) { // only one item?
template_browser->value(1); // select it
template_browser->do_callback();
}
// Show the panel and wait for the user to do something... // Show the panel and wait for the user to do something...
template_panel->show(); template_panel->show();
while (template_panel->shown()) Fl::wait(); while (template_panel->shown()) Fl::wait();

4
fluid/template_panel.cxx
View File

@ -147,13 +147,13 @@ Fl_Double_Window* make_template_panel() {
template_preview->align(Fl_Align(69|FL_ALIGN_INSIDE)); template_preview->align(Fl_Align(69|FL_ALIGN_INSIDE));
Fl_Group::current()->resizable(template_preview); Fl_Group::current()->resizable(template_preview);
} // Fl_Box* template_preview } // Fl_Box* template_preview
{ template_name = new Fl_Input(144, 288, 306, 25, "Template Name:"); { template_name = new Fl_Input(198, 288, 252, 25, "Template Name:");
template_name->labelfont(1); template_name->labelfont(1);
template_name->textfont(4); template_name->textfont(4);
template_name->callback((Fl_Callback*)cb_template_name); template_name->callback((Fl_Callback*)cb_template_name);
template_name->when(3); template_name->when(3);
} // Fl_Input* template_name } // Fl_Input* template_name
{ template_instance = new Fl_Input(124, 288, 326, 25, "Instance Name:"); { template_instance = new Fl_Input(198, 288, 252, 25, "Instance Name:");
template_instance->labelfont(1); template_instance->labelfont(1);
template_instance->textfont(4); template_instance->textfont(4);
template_instance->hide(); template_instance->hide();

4
fluid/template_panel.fl
View File

@ -130,11 +130,11 @@ if (img) {
template_submit->activate(); template_submit->activate();
if (Fl::event_key() == FL_Enter) template_panel->hide(); if (Fl::event_key() == FL_Enter) template_panel->hide();
} else template_submit->deactivate();} selected } else template_submit->deactivate();} selected
xywh {144 288 306 25} labelfont 1 when 3 textfont 4 xywh {198 288 252 25} labelfont 1 when 3 textfont 4
} }
Fl_Input template_instance { Fl_Input template_instance {
label {Instance Name:} label {Instance Name:}
xywh {124 288 326 25} labelfont 1 textfont 4 hide xywh {198 288 252 25} labelfont 1 textfont 4 hide
} }
Fl_Group {} { Fl_Group {} {
xywh {10 323 440 25} xywh {10 323 440 25}