ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix parent scroll resetting on directory change

This commit is contained in:
Stenzek 2025-01-18 13:19:26 +10:00
parent e34d23c8e7
commit 7cc47551a4
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/imgui_fullscreen.cpp
View File

@ -157,6 +157,7 @@ struct ALIGN_TO_CACHE_LINE UIState
bool file_selector_open = false; bool file_selector_open = false;
bool file_selector_directory = false; bool file_selector_directory = false;
bool file_selector_directory_changed = false;
std::string file_selector_title; std::string file_selector_title;
ImGuiFullscreen::FileSelectorCallback file_selector_callback; ImGuiFullscreen::FileSelectorCallback file_selector_callback;
std::string file_selector_current_directory; std::string file_selector_current_directory;
@ -2282,12 +2283,12 @@ void ImGuiFullscreen::OpenFileSelector(std::string_view title, bool select_direc
s_state.file_selector_open = true; s_state.file_selector_open = true;
s_state.file_selector_directory = select_directory; s_state.file_selector_directory = select_directory;
s_state.file_selector_directory_changed = true;
s_state.file_selector_title = fmt::format("{}##file_selector", title); s_state.file_selector_title = fmt::format("{}##file_selector", title);
s_state.file_selector_callback = std::move(callback); s_state.file_selector_callback = std::move(callback);
s_state.file_selector_filters = std::move(filters); s_state.file_selector_filters = std::move(filters);
SetFileSelectorDirectory(std::move(initial_directory)); SetFileSelectorDirectory(std::move(initial_directory));
QueueResetFocus(FocusResetType::PopupOpened);
} }
void ImGuiFullscreen::CloseFileSelector() void ImGuiFullscreen::CloseFileSelector()
@ -2300,6 +2301,7 @@ void ImGuiFullscreen::CloseFileSelector()
s_state.file_selector_open = false; s_state.file_selector_open = false;
s_state.file_selector_directory = false; s_state.file_selector_directory = false;
s_state.file_selector_directory_changed = false;
std::string().swap(s_state.file_selector_title); std::string().swap(s_state.file_selector_title);
FileSelectorCallback().swap(s_state.file_selector_callback); FileSelectorCallback().swap(s_state.file_selector_callback);
FileSelectorFilters().swap(s_state.file_selector_filters); FileSelectorFilters().swap(s_state.file_selector_filters);
@ -2337,6 +2339,12 @@ void ImGuiFullscreen::DrawFileSelector()
{ {
ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor); ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor);
if (s_state.file_selector_directory_changed)
{
s_state.file_selector_directory_changed = false;
QueueResetFocus(FocusResetType::Other);
}
ResetFocusHere(); ResetFocusHere();
BeginMenuButtons(); BeginMenuButtons();
@ -2388,7 +2396,7 @@ void ImGuiFullscreen::DrawFileSelector()
else else
{ {
SetFileSelectorDirectory(std::move(selected->full_path)); SetFileSelectorDirectory(std::move(selected->full_path));
QueueResetFocus(FocusResetType::Other); s_state.file_selector_directory_changed = true;
} }
} }
else if (directory_selected) else if (directory_selected)
@ -2412,7 +2420,7 @@ void ImGuiFullscreen::DrawFileSelector()
s_state.file_selector_items.front().display_name == ICON_FA_FOLDER_OPEN " <Parent Directory>") s_state.file_selector_items.front().display_name == ICON_FA_FOLDER_OPEN " <Parent Directory>")
{ {
SetFileSelectorDirectory(std::move(s_state.file_selector_items.front().full_path)); SetFileSelectorDirectory(std::move(s_state.file_selector_items.front().full_path));
QueueResetFocus(FocusResetType::Other); s_state.file_selector_directory_changed = true;
} }
} }
} }