UI: fixed file dialog input handling

the issue was introduced in the context of #517
vengi-voxel · Jan 13, 2025 · a6fa616 · a6fa616
1 parent 1de103b
commit a6fa616
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/modules/ui/FileDialog.cpp b/src/modules/ui/FileDialog.cpp
@@ -761,7 +761,9 @@ void FileDialog::onTextInput(void *windowHandle, const core::String &text) {
 	if (text.empty()) {
 		return;
 	}
-	int idx = 0;
+	if (!_acceptInput) {
+		return;
+	}
 
 	const core::TimeProviderPtr &timeProvider = _app->timeProvider();
 	if (!_scrollToText.isValid(timeProvider->tickNow())) {
@@ -770,6 +772,8 @@ void FileDialog::onTextInput(void *windowHandle, const core::String &text) {
 	} else {
 		_scrollToText.value().append(text);
 	}
+
+	int idx = 0;
 	for (const auto &entry : _filteredEntities) {
 		if (core::string::startsWith(entry->name, _scrollToText.value())) {
 			_selectedEntry = *entry;
@@ -782,18 +786,27 @@ void FileDialog::onTextInput(void *windowHandle, const core::String &text) {
 }
 
 bool FileDialog::showFileDialog(video::FileDialogOptions &options, core::String &entityPath, video::OpenFileMode type,
-								const io::FormatDescription **formatDesc) {
+								const io::FormatDescription **formatDesc, bool &showFileDialog) {
+	_acceptInput = false;
+	if (!showFileDialog) {
+		return false;
+	}
 	float width = core_min(100.0f * ImGui::GetFontSize(), ImGui::GetMainViewport()->Size.x * 0.95f);
 	const float itemHeight = (ImGui::GetFontSize() + ImGui::GetStyle().ItemSpacing.y);
 	ImGui::SetNextWindowSize(ImVec2(width, 0.0f));
 	const char *title = popupTitle(type);
 	if (!ImGui::IsPopupOpen(title)) {
 		ImGui::OpenPopup(title);
+		Log::error("Opened popup %s", title);
 	}
 
 	if (ImGui::BeginPopupModal(title)) {
+		_acceptInput = ImGui::GetTopMostPopupModal() == ImGui::GetCurrentWindow();
 		if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 			ImGui::CloseCurrentPopup();
+			ImGui::EndPopup();
+			showFileDialog = false;
+			return false;
 		}
 		currentPathPanel(type);
 		quickAccessPanel(type, _bookmarks->strVal(), 20 * itemHeight);

diff --git a/src/modules/ui/FileDialog.h b/src/modules/ui/FileDialog.h
@@ -58,6 +58,7 @@ class FileDialog : public Panel {
 	// used when e.g. changing the directory
 	bool _needsSorting = false;
 	bool _scrollToSelection = false;
+	bool _acceptInput = false;
 	TimedString _scrollToText;
 
 	io::FilesystemEntry _newFolderName;
@@ -114,9 +115,10 @@ class FileDialog : public Panel {
 	* @param entityPath Output buffer for the full path of the selected entity
 	* @return @c true if user input was made - either an entity was selected, or the selection was cancelled.
 	* @return @c false if no user input was made yet and the dialog should still run
+	* @note If you want to close the dialog, set @c showFileDialog to @c false
 	*/
 	bool showFileDialog(video::FileDialogOptions &fileDialogOptions, core::String &entityPath, video::OpenFileMode type,
-						const io::FormatDescription **formatDesc = nullptr);
+						const io::FormatDescription **formatDesc, bool &showFileDialog);
 };
 
 }
diff --git a/src/modules/ui/IMGUIApp.cpp b/src/modules/ui/IMGUIApp.cpp
@@ -722,7 +722,7 @@ app::AppState IMGUIApp::onRunning() {
 
 		core::String buf;
 		const io::FormatDescription *formatDesc = nullptr;
-		if (_showFileDialog && _fileDialog.showFileDialog(_fileDialogOptions, buf, _fileDialogMode, &formatDesc)) {
+		if (_fileDialog.showFileDialog(_fileDialogOptions, buf, _fileDialogMode, &formatDesc, _showFileDialog)) {
 			if (buf[0] != '\0') {
 				_fileDialogCallback(buf, formatDesc);
 			}