Browse Source

STR #1028" set size ranges for filechooser 'favorites' dialog and for help dialog

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
pull/168/head
Matthias Melcher 20 years ago
parent
commit
990415bd04
  1. 3
      src/Fl_File_Chooser.cxx
  2. 15
      src/Fl_File_Chooser.fl
  3. 1
      src/Fl_Help_Dialog.cxx
  4. 6
      src/Fl_Help_Dialog.fl

3
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(); 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_); o->callback((Fl_Callback*)cb_);
{ Fl_File_Browser* o = fileList = new Fl_File_Browser(10, 45, 295, 225); { Fl_File_Browser* o = fileList = new Fl_File_Browser(10, 45, 295, 225);
o->type(2); 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); favWindow->label(manage_favorites_label);
o->set_modal(); o->set_modal();
o->size_range(181, 150);
o->end(); o->end();
} }
callback_ = 0; callback_ = 0;

15
src/Fl_File_Chooser.fl

@ -90,7 +90,7 @@ window->hide();} open
} }
Fl_Tile {} { Fl_Tile {} {
callback {update_preview();} callback {update_preview();}
private xywh {10 45 470 225} resizable private xywh {10 45 471 225} resizable
} { } {
Fl_File_Browser fileList { Fl_File_Browser fileList {
callback {fileListCB();} callback {fileListCB();}
@ -98,7 +98,7 @@ window->hide();} open
code0 {\#include <FL/Fl_File_Browser.H>} code0 {\#include <FL/Fl_File_Browser.H>}
} }
Fl_Box previewBox { Fl_Box previewBox {
label {?} label {?} selected
private xywh {305 45 175 225} box DOWN_BOX labelsize 100 align 80 private xywh {305 45 175 225} box DOWN_BOX labelsize 100 align 80
} }
} }
@ -159,8 +159,8 @@ window->hide();}
} }
Fl_Window favWindow { Fl_Window favWindow {
label {Manage Favorites} label {Manage Favorites}
private xywh {580 50 355 150} type Double hide resizable private xywh {580 50 355 150} type Double resizable
code0 {favWindow->label(manage_favorites_label);} modal code0 {favWindow->label(manage_favorites_label);} modal size_range {181 150 0 0} visible
} { } {
Fl_File_Browser favList { Fl_File_Browser favList {
callback {favoritesCB(favList);} callback {favoritesCB(favList);}
@ -356,12 +356,11 @@ else
} { } {
code {return (type_);} {} 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;} {} code {data_ = d;} {}
} }

1
src/Fl_Help_Dialog.cxx

@ -208,6 +208,7 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
} }
o->end(); o->end();
} }
o->size_range(260, 150);
o->end(); o->end();
} }
back_->deactivate(); back_->deactivate();

6
src/Fl_Help_Dialog.fl

@ -45,8 +45,8 @@ class FL_EXPORT Fl_Help_Dialog {open
Function {Fl_Help_Dialog()} {open Function {Fl_Help_Dialog()} {open
} { } {
Fl_Window window_ { Fl_Window window_ {
label {Help Dialog} open label {Help Dialog} open selected
private xywh {398 65 530 385} type Double resizable visible private xywh {398 65 530 385} type Double resizable size_range {260 150 0 0} visible
} { } {
Fl_Group view_ { Fl_Group view_ {
callback {if (view_->changed()) callback {if (view_->changed())
@ -152,7 +152,7 @@ smaller_->activate();}
} { } {
Fl_Input find_ { Fl_Input find_ {
label {@search} 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 private tooltip {find text in document} xywh {35 352 268 21} box FLAT_BOX labelsize 13 when 10 resizable
} }
} }

Loading…
Cancel
Save