Skip to content

[wpigui] Fix PFD file dialogs not closing after window closing #5530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 12, 2023
Merged

[wpigui] Fix PFD file dialogs not closing after window closing #5530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23240ce
File dialog destructor and PFD windows patch
ohowe1 Aug 11, 2023
a158f3d
Merge branch 'main' into pfd-window-fix
ohowe1 Aug 11, 2023
16573de
format
ohowe1 Aug 11, 2023
a4e0aed
Move kill to dialog destructor
ohowe1 Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions wpigui/src/main/native/cpp/portable-file-dialogs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,12 @@ HANDLE internal::platform::new_style_context::create()

// dialog implementation

internal::dialog::~dialog() {
if (m_async->m_running) {
kill();
}
}

bool internal::dialog::ready(int timeout /* = default_wait_timeout */) const
{
return m_async->ready(timeout);
Expand Down Expand Up @@ -804,7 +810,7 @@ class internal::file_dialog::Impl {
#if _WIN32
static int CALLBACK bffcallback(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData);
#if PFD_HAS_IFILEDIALOG
std::string select_folder_vista(IFileDialog *ifd, bool force_path);
std::string select_folder_vista(IFileDialog *ifd, bool force_path, HWND active_window);
#endif

std::wstring m_wtitle;
Expand All @@ -831,8 +837,9 @@ internal::file_dialog::file_dialog(type in_type,
}
filter_list += '\0';

HWND active_window = GetActiveWindow();
m_async->start_func([this, in_type, title, default_path, filter_list,
options](int *exit_code) -> std::string
options, active_window](int *exit_code) -> std::string
{
(void)exit_code;
m_impl->m_wtitle = internal::str2wstr(title);
Expand All @@ -858,7 +865,7 @@ internal::file_dialog::file_dialog(type in_type,

// In case CoCreateInstance fails (which it should not), try legacy approach
if (SUCCEEDED(hr))
return m_impl->select_folder_vista(ifd, options & opt::force_path);
return m_impl->select_folder_vista(ifd, options & opt::force_path, active_window);
}
#endif

Expand Down Expand Up @@ -892,7 +899,7 @@ internal::file_dialog::file_dialog(type in_type,
OPENFILENAMEW ofn;
memset(&ofn, 0, sizeof(ofn));
ofn.lStructSize = sizeof(OPENFILENAMEW);
ofn.hwndOwner = GetActiveWindow();
ofn.hwndOwner = active_window;

ofn.lpstrFilter = wfilter_list.c_str();

Expand Down Expand Up @@ -1169,7 +1176,7 @@ int CALLBACK internal::file_dialog::Impl::bffcallback(HWND hwnd, UINT uMsg,
}

#if PFD_HAS_IFILEDIALOG
std::string internal::file_dialog::Impl::select_folder_vista(IFileDialog *ifd, bool force_path)
std::string internal::file_dialog::Impl::select_folder_vista(IFileDialog *ifd, bool force_path, HWND active_window)
{
std::string result;

Expand Down Expand Up @@ -1206,7 +1213,7 @@ std::string internal::file_dialog::Impl::select_folder_vista(IFileDialog *ifd, b
ifd->SetOptions(FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM);
ifd->SetTitle(m_wtitle.c_str());

hr = ifd->Show(GetActiveWindow());
hr = ifd->Show(active_window);
if (SUCCEEDED(hr))
{
IShellItem* item;
Expand Down Expand Up @@ -1393,13 +1400,15 @@ message::message(std::string const &title,
m_mappings[IDRETRY] = button::retry;
m_mappings[IDIGNORE] = button::ignore;

m_async->start_func([text, title, style](int* exit_code) -> std::string
HWND active_window = GetActiveWindow();

m_async->start_func([text, title, style, active_window](int* exit_code) -> std::string
{
auto wtext = internal::str2wstr(text);
auto wtitle = internal::str2wstr(title);
// Apply new visual style (required for all Windows versions)
internal::platform::new_style_context ctx;
*exit_code = MessageBoxW(GetActiveWindow(), wtext.c_str(), wtitle.c_str(), style);
*exit_code = MessageBoxW(active_window, wtext.c_str(), wtitle.c_str(), style);
return "";
});

Expand Down
3 changes: 2 additions & 1 deletion wpigui/src/main/native/include/portable-file-dialogs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class executor;
class dialog : protected settings
{
public:
virtual ~dialog();
bool ready(int timeout = default_wait_timeout) const;
bool kill() const;

Expand All @@ -146,7 +147,7 @@ class dialog : protected settings
std::shared_ptr<executor> m_async;
};

class file_dialog : public dialog
class file_dialog : public internal::dialog
Copy link
Member

@PeterJohnson PeterJohnson Aug 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change shouldn't be required?

Copy link
Contributor Author

@ohowe1 ohowe1 Aug 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It isn't required, but I made the change for it to be consistent with the other dialog classes being explicit about the namespace

{
protected:
enum type
Expand Down