Added SetInitialFilename() to FileDialog, and updated AssetBrowser to use it (#770)

Author: adriengivry

Sources/OvEditor/src/OvEditor/Core/EditorActions.cpp

@@ -1081,6 +1081,7 @@ bool OvEditor::Core::EditorActions::ImportAsset(const std::string& p_initialDest
 
 		SaveFileDialog saveLocationDialog("Where to import?");
 		saveLocationDialog.SetInitialDirectory(p_initialDestinationDirectory);
+		saveLocationDialog.SetInitialFilename(filename);
 		saveLocationDialog.DefineExtension(extension, extension);
 		saveLocationDialog.Show();
 

Sources/OvWindowing/include/OvWindowing/Dialogs/FileDialog.h

@@ -74,6 +74,12 @@ namespace OvWindowing::Dialogs
 		*/
 		void SetInitialDirectory(const std::string& p_initialDirectory);
 
+		/**
+		* Defines the initial filename pre-populated in the dialog
+		* @param p_initialFilename
+		*/
+		void SetInitialFilename(const std::string& p_initialFilename);
+
 		/**
 		* Show the file dialog
 		* @param p_flags
@@ -112,6 +118,7 @@ namespace OvWindowing::Dialogs
 		std::function<int(tagOFNA*)> m_callback;
 		const std::string m_dialogTitle;
 		std::string m_initialDirectory;
+		std::string m_initialFilename;
 		std::string m_filter;
 		std::string m_error;
 		std::string m_filename;

Sources/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp

@@ -30,6 +30,11 @@ void OvWindowing::Dialogs::FileDialog::SetInitialDirectory(const std::string & p
 	m_initialDirectory = p_initialDirectory;
 }
 
+void OvWindowing::Dialogs::FileDialog::SetInitialFilename(const std::string& p_initialFilename)
+{
+	m_initialFilename = p_initialFilename;
+}
+
 void OvWindowing::Dialogs::FileDialog::Show(EExplorerFlags p_flags)
 {
 #ifdef _WIN32
@@ -38,6 +43,9 @@ void OvWindowing::Dialogs::FileDialog::Show(EExplorerFlags p_flags)
 	if (!m_initialDirectory.empty())
 		m_filepath = m_initialDirectory;
 
+	if (!m_initialFilename.empty())
+		m_filepath = (std::filesystem::path{ m_initialDirectory } / m_initialFilename).string();
+
 	m_filepath.resize(MAX_PATH);
 
 	ZeroMemory(&ofn, sizeof(ofn));
@@ -72,11 +80,10 @@ void OvWindowing::Dialogs::FileDialog::Show(EExplorerFlags p_flags)
 	if (m_isSaveDialog)
 		command += " --save";
 
-	if (!m_initialDirectory.empty())
+	if (!m_initialDirectory.empty() || !m_initialFilename.empty())
 	{
-		// Add trailing slash to indicate directory for zenity
-		command += " --filename=\"" + m_initialDirectory;
-		if (m_initialDirectory.back() != '/')
+		command += " --filename=\"" + (std::filesystem::path{ m_initialDirectory } / m_initialFilename).string();
+		if (m_initialFilename.empty() && m_initialDirectory.back() != '/')
 			command += "/";
 		command += "\"";
 	}