drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia/studio] Fix file dialog to close properly

Browse Source
This commit is contained in:
Gary Talent 2021-10-23 21:35:00 -05:00
parent 8a6f08ae73
commit 4a4f380a11
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nostalgia/studio/lib/filedialog_gtk.cpp
View File

@ -12,18 +12,16 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <ox/std/defer.hpp> #include <ox/std/defer.hpp>
#include <ox/std/memory.hpp>
#include <ox/std/string.hpp> #include <ox/std/string.hpp>
#include <ox/std/trace.hpp>
namespace nostalgia::studio { namespace nostalgia::studio {
ox::Result<ox::String> chooseDirectory() noexcept { ox::Result<ox::String> chooseDirectory() noexcept {
ox::Result<ox::String> out; ox::Result<ox::String> out;
const auto action = GTK_FILE_CHOOSER_ACTION_OPEN; const auto action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
gtk_init(0, nullptr); gtk_init(nullptr, nullptr);
auto dialog = gtk_file_chooser_dialog_new("Open File", nullptr, action, auto dialog = gtk_file_chooser_dialog_new("Open Project Directory", nullptr, action,
("_Cancel"), GTK_RESPONSE_CANCEL, ("_Cancel"), GTK_RESPONSE_CANCEL,
("_Open"), GTK_RESPONSE_ACCEPT, ("_Open"), GTK_RESPONSE_ACCEPT,
nullptr); nullptr);
const auto res = gtk_dialog_run(GTK_DIALOG(dialog)); const auto res = gtk_dialog_run(GTK_DIALOG(dialog));
@ -36,6 +34,10 @@ ox::Result<ox::String> chooseDirectory() noexcept {
out = OxError(1); out = OxError(1);
} }
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
// for some reason we need to 4 iterations through the main loop to destroy the dialog
for (int i = 0; i < 4; ++i) {
gtk_main_iteration_do(false);
}
return out; return out;
} }