Fixes issue SpartanJ/ecode#306.

Updated efsw.
SpartanJ · Aug 4, 2024 · 7c556ad · 7c556ad
1 parent 04065d9
commit 7c556ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/include/eepp/ui/uifiledialog.hpp b/include/eepp/ui/uifiledialog.hpp
@@ -68,7 +68,7 @@ class EE_API UIFileDialog : public UIWindow {
 
 	UITextInput* getFileInput() const;
 
-	UIDropDownList* getFiletypeList() const;
+	UIDropDownList* getFileTypeList() const;
 
 	void addFilePattern( std::string pattern, bool select = false );
 

diff --git a/src/eepp/ui/uifiledialog.cpp b/src/eepp/ui/uifiledialog.cpp
@@ -106,7 +106,14 @@ UIFileDialog::UIFileDialog( Uint32 dialogFlags, const std::string& defaultFilePa
 				if ( !FileSystem::fileExists( newFolderPath ) &&
 					 FileSystem::makeDir( newFolderPath ) ) {
 					refreshFolder();
+
+					ModelIndex index =
+						mMultiView->getCurrentView()->findRowWithText( folderName, true, true );
+					if ( index.isValid() )
+						mMultiView->setSelection( index );
 				}
+
+				msgBox->closeWindow();
 			} );
 		}
 	} );
@@ -203,7 +210,7 @@ UIFileDialog::UIFileDialog( Uint32 dialogFlags, const std::string& defaultFilePa
 			mMultiView->getCurrentView()->setFocus();
 			mMultiView->getCurrentView()->forceKeyDown( *kevent );
 		}
-	});
+	} );
 
 	mButtonOpen = UIPushButton::New();
 	mButtonOpen
@@ -439,8 +446,7 @@ std::string UIFileDialog::getSelectedDrive() const {
 	ModelIndex index = getSelectionModelIndex();
 	ModelIndex modelIndex( mDiskDrivesModel->index( index.row(), DiskDrivesModel::Name ) );
 	Variant var( mDiskDrivesModel->data( modelIndex ) );
-	std::string drive( var.asCStr() );
-	return drive;
+	return var.toString();
 }
 
 void UIFileDialog::openFileOrFolder( bool shouldOpenFolder = false ) {
@@ -712,7 +718,7 @@ UITextInput* UIFileDialog::getFileInput() const {
 	return mFile;
 }
 
-UIDropDownList* UIFileDialog::getFiletypeList() const {
+UIDropDownList* UIFileDialog::getFileTypeList() const {
 	return mFiletype;
 }
 

diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw
+2 −0		.gitignore
+15 −15		CMakeLists.txt
+3 −0		efswConfig.cmake.in
+4 −2		src/efsw/Debug.hpp
+1 −1		src/efsw/FileWatcherGeneric.cpp
+1 −1		src/efsw/FileWatcherInotify.cpp
+1 −1		src/efsw/FileWatcherKqueue.cpp
+3 −2		src/efsw/FileWatcherWin32.cpp
+12 −2		src/efsw/Lock.hpp
+20 −0		src/efsw/Mutex.cpp
+23 −2		src/efsw/Mutex.hpp
+41 −0		src/efsw/Thread.cpp
+79 −28		src/efsw/Thread.hpp
+2 −1		src/efsw/WatcherKqueue.cpp
+142 −17		src/efsw/WatcherWin32.cpp
+1 −0		src/efsw/WatcherWin32.hpp
+4 −0		src/efsw/platform/platformimpl.hpp
+28 −0		src/efsw/platform/posix/MutexImpl.cpp
+30 −0		src/efsw/platform/posix/MutexImpl.hpp
+62 −0		src/efsw/platform/posix/ThreadImpl.cpp
+39 −0		src/efsw/platform/posix/ThreadImpl.hpp
+25 −0		src/efsw/platform/win/MutexImpl.cpp
+33 −0		src/efsw/platform/win/MutexImpl.hpp
+56 −0		src/efsw/platform/win/ThreadImpl.cpp
+42 −0		src/efsw/platform/win/ThreadImpl.hpp