diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index 0caca81eb..a6316815e 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -185,7 +185,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char } o->end(); } - { Fl_Tile* o = new Fl_Tile(10, 45, 470, 225); + { Fl_Tile* o = new Fl_Tile(10, 45, 471, 225); o->callback((Fl_Callback*)cb_); { Fl_File_Browser* o = fileList = new Fl_File_Browser(10, 45, 295, 225); o->type(2); @@ -284,6 +284,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char } favWindow->label(manage_favorites_label); o->set_modal(); + o->size_range(181, 150); o->end(); } callback_ = 0; diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 7284b8984..7be3d2752 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -90,7 +90,7 @@ window->hide();} open } Fl_Tile {} { callback {update_preview();} - private xywh {10 45 470 225} resizable + private xywh {10 45 471 225} resizable } { Fl_File_Browser fileList { callback {fileListCB();} @@ -98,7 +98,7 @@ window->hide();} open code0 {\#include } } Fl_Box previewBox { - label {?} + label {?} selected private xywh {305 45 175 225} box DOWN_BOX labelsize 100 align 80 } } @@ -159,8 +159,8 @@ window->hide();} } Fl_Window favWindow { label {Manage Favorites} - private xywh {580 50 355 150} type Double hide resizable - code0 {favWindow->label(manage_favorites_label);} modal + private xywh {580 50 355 150} type Double resizable + code0 {favWindow->label(manage_favorites_label);} modal size_range {181 150 0 0} visible } { Fl_File_Browser favList { callback {favoritesCB(favList);} @@ -356,12 +356,11 @@ else } { code {return (type_);} {} } - Function {user_data() const} {selected return_type {void *} + Function {user_data() const} {return_type {void *} } { - code {return (data_);} {selected - } + code {return (data_);} {} } - Function {user_data(void *d)} {selected return_type void + Function {user_data(void *d)} {return_type void } { code {data_ = d;} {} } diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx index bd4d7e5a1..0795d784d 100644 --- a/src/Fl_Help_Dialog.cxx +++ b/src/Fl_Help_Dialog.cxx @@ -208,6 +208,7 @@ Fl_Help_Dialog::Fl_Help_Dialog() { } o->end(); } + o->size_range(260, 150); o->end(); } back_->deactivate(); diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl index 196d6339d..311d69c26 100644 --- a/src/Fl_Help_Dialog.fl +++ b/src/Fl_Help_Dialog.fl @@ -45,8 +45,8 @@ class FL_EXPORT Fl_Help_Dialog {open Function {Fl_Help_Dialog()} {open } { Fl_Window window_ { - label {Help Dialog} open - private xywh {398 65 530 385} type Double resizable visible + label {Help Dialog} open selected + private xywh {398 65 530 385} type Double resizable size_range {260 150 0 0} visible } { Fl_Group view_ { callback {if (view_->changed()) @@ -152,7 +152,7 @@ smaller_->activate();} } { Fl_Input find_ { label {@search} - callback {find_pos_ = view_->find(find_->value(), find_pos_);} selected + callback {find_pos_ = view_->find(find_->value(), find_pos_);} private tooltip {find text in document} xywh {35 352 268 21} box FLAT_BOX labelsize 13 when 10 resizable } }