@@ -24,53 +24,32 @@ class FilePickerHelper {
2424 static bool _effectiveLockParentWindow (bool lockParentWindow) =>
2525 lockParentWindow || Platform .isWindows;
2626
27- static Future <bool > _beforeDialog () async {
28- if (! _isDesktop) return false ;
29-
30- var restoreMaximized = false ;
31- if (Platform .isMacOS && await windowManager.isMaximized ()) {
32- restoreMaximized = true ;
33- await windowManager.unmaximize ();
34- }
35-
36- if (_shouldMinimizeDesktopWindow) {
37- await windowManager.minimize ();
38- await Future .delayed (const Duration (milliseconds: 120 ));
39- }
40-
41- await windowManager.focus ();
42- return restoreMaximized;
27+ static Future <void > _beforeDialog () async {
28+ if (! _isDesktop || ! _shouldMinimizeDesktopWindow) return ;
29+ await windowManager.minimize ();
30+ await Future .delayed (const Duration (milliseconds: 120 ));
4331 }
4432
45- static Future <void > _afterDialog (bool restoreMaximized) async {
46- if (! _isDesktop) return ;
47-
48- if (_shouldMinimizeDesktopWindow) {
49- await windowManager.restore ();
50- await windowManager.maximize ();
51- await windowManager.focus ();
52- return ;
53- }
54-
55- if (Platform .isMacOS && restoreMaximized) {
56- await windowManager.maximize ();
57- await windowManager.focus ();
58- }
33+ static Future <void > _afterDialog () async {
34+ if (! _isDesktop || ! _shouldMinimizeDesktopWindow) return ;
35+ await windowManager.restore ();
36+ await windowManager.maximize ();
37+ await windowManager.focus ();
5938 }
6039
6140 /// Replacement for [FilePicker.platform.getDirectoryPath] .
6241 static Future <String ?> getDirectoryPath ({
6342 String ? dialogTitle,
6443 bool lockParentWindow = false ,
6544 }) async {
66- final restoreMaximized = await _beforeDialog ();
45+ await _beforeDialog ();
6746 try {
6847 return await FilePicker .platform.getDirectoryPath (
6948 dialogTitle: dialogTitle,
7049 lockParentWindow: _effectiveLockParentWindow (lockParentWindow),
7150 );
7251 } finally {
73- await _afterDialog (restoreMaximized );
52+ await _afterDialog ();
7453 }
7554 }
7655
@@ -83,7 +62,7 @@ class FilePickerHelper {
8362 bool withData = false ,
8463 bool lockParentWindow = false ,
8564 }) async {
86- final restoreMaximized = await _beforeDialog ();
65+ await _beforeDialog ();
8766 try {
8867 return await FilePicker .platform.pickFiles (
8968 dialogTitle: dialogTitle,
@@ -94,7 +73,7 @@ class FilePickerHelper {
9473 lockParentWindow: _effectiveLockParentWindow (lockParentWindow),
9574 );
9675 } finally {
97- await _afterDialog (restoreMaximized );
76+ await _afterDialog ();
9877 }
9978 }
10079
@@ -106,7 +85,7 @@ class FilePickerHelper {
10685 List <String >? allowedExtensions,
10786 bool lockParentWindow = false ,
10887 }) async {
109- final restoreMaximized = await _beforeDialog ();
88+ await _beforeDialog ();
11089 try {
11190 return await FilePicker .platform.saveFile (
11291 dialogTitle: dialogTitle,
@@ -116,7 +95,7 @@ class FilePickerHelper {
11695 lockParentWindow: _effectiveLockParentWindow (lockParentWindow),
11796 );
11897 } finally {
119- await _afterDialog (restoreMaximized );
98+ await _afterDialog ();
12099 }
121100 }
122101}
0 commit comments