STR #1056: fixed a slight offset in the Fl_File_Chooser that kept resizing from working correctly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4613 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 13 insertions, 12 deletions

diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index a6316815e..cb985f15e 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -63,8 +63,8 @@ void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
 
 #include <FL/Fl_Bitmap.H>
 static unsigned char idata_new[] =
-"\0\0x\0\204\0\2\1\1\376\1\200""1\200""1\200\375\200\375\200""1\200""1\200\1\
-\200\1\200\377\377\0\0";
+{0,0,120,0,132,0,2,1,1,254,1,128,49,128,49,128,253,128,253,128,49,128,49,
+128,1,128,1,128,255,255,0,0};
 static Fl_Bitmap image_new(idata_new, 16, 16);
 
 void Fl_File_Chooser::cb__i(Fl_Tile*, void*) {
@@ -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, 471, 225);
+    { Fl_Tile* o = new Fl_Tile(10, 45, 470, 225);
       o->callback((Fl_Callback*)cb_);
       { Fl_File_Browser* o = fileList = new Fl_File_Browser(10, 45, 295, 225);
         o->type(2);
@@ -200,7 +200,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Group* o = new Fl_Group(0, 275, 480, 95);
+    { Fl_Group* o = new Fl_Group(10, 275, 470, 95);
       { Fl_Group* o = new Fl_Group(10, 275, 470, 20);
         { Fl_Check_Button* o = previewButton = new Fl_Check_Button(10, 275, 170, 20, "Preview");
           o->down_box(FL_DOWN_BOX);
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index 7be3d2752..451fb567e 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -53,13 +53,14 @@ class FL_EXPORT Fl_File_Chooser {open
   decl {void showChoiceCB();} {}
   decl {void update_favorites();} {}
   decl {void update_preview();} {}
-  Function {Fl_File_Chooser(const char *d, const char *p, int t, const char *title)} {} {
+  Function {Fl_File_Chooser(const char *d, const char *p, int t, const char *title)} {open
+  } {
     Fl_Window window {
       label {Choose File}
       callback {fileName->value("");
 fileList->deselect();
 Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
-window->hide();} open
+window->hide();} selected
       private xywh {387 242 490 380} type Double resizable
       code0 {if (title) window->label(title);}
       code1 {\#include <stdio.h>}
@@ -89,8 +90,8 @@ window->hide();} open
         }
       }
       Fl_Tile {} {
-        callback {update_preview();}
-        private xywh {10 45 471 225} resizable
+        callback {update_preview();} open
+        private xywh {10 45 470 225} resizable
       } {
         Fl_File_Browser fileList {
           callback {fileListCB();}
@@ -98,12 +99,12 @@ window->hide();} open
           code0 {\#include <FL/Fl_File_Browser.H>}
         }
         Fl_Box previewBox {
-          label {?} selected
+          label {?}
           private xywh {305 45 175 225} box DOWN_BOX labelsize 100 align 80
         }
       }
-      Fl_Group {} {open
-        private xywh {0 275 480 95}
+      Fl_Group {} {
+        private xywh {10 275 470 95}
       } {
         Fl_Group {} {
           private xywh {10 275 470 20}
@@ -159,7 +160,7 @@ window->hide();}
     }
     Fl_Window favWindow {
       label {Manage Favorites}
-      private xywh {580 50 355 150} type Double resizable
+      private xywh {437 187 355 150} type Double resizable
       code0 {favWindow->label(manage_favorites_label);} modal size_range {181 150 0 0} visible
     } {
       Fl_File_Browser favList {