Filter button should set selection's directory, too

diff --git a/Lib/lib-tk/FileDialog.py b/Lib/lib-tk/FileDialog.py
index fb2ccd7c43316f06ecf3af950048d5c345182698..a2e56eaed88c435e021f1b16e6f1673cb5755fbf 100644 (file)
--- a/Lib/lib-tk/FileDialog.py
+++ b/Lib/lib-tk/FileDialog.py
@@ -77,9 +77,9 @@ class FileDialog:
     def go(self, directory=os.curdir, pattern="*", default=""):
        self.directory = directory
        self.set_filter(directory, pattern)
+       self.filter_command()
        self.set_selection(default)
        self.selection.focus_set()
-       self.filter_command()
        self.top.grab_set()
        try:
            self.master.mainloop()
@@ -136,6 +136,9 @@ class FileDialog:
        self.files.delete(0, END)
        for name in matchingfiles:
            self.files.insert(END, name)
+       head, tail = os.path.split(self.selection.get())
+       if tail == os.curdir: tail = ''
+       self.set_selection(tail)
 
     def get_filter(self):
        filter = self.filter.get()

diff --git a/Lib/tkinter/FileDialog.py b/Lib/tkinter/FileDialog.py
index fb2ccd7c43316f06ecf3af950048d5c345182698..a2e56eaed88c435e021f1b16e6f1673cb5755fbf 100755 (executable)
--- a/Lib/tkinter/FileDialog.py
+++ b/Lib/tkinter/FileDialog.py
@@ -77,9 +77,9 @@ class FileDialog:
     def go(self, directory=os.curdir, pattern="*", default=""):
        self.directory = directory
        self.set_filter(directory, pattern)
+       self.filter_command()
        self.set_selection(default)
        self.selection.focus_set()
-       self.filter_command()
        self.top.grab_set()
        try:
            self.master.mainloop()
@@ -136,6 +136,9 @@ class FileDialog:
        self.files.delete(0, END)
        for name in matchingfiles:
            self.files.insert(END, name)
+       head, tail = os.path.split(self.selection.get())
+       if tail == os.curdir: tail = ''
+       self.set_selection(tail)
 
     def get_filter(self):
        filter = self.filter.get()