history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 03:35:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

FullscreenUI: Make achievements/settings/load state closable with controller

Browse Source
This commit is contained in:
Connor McLaughlin
2021-03-03 03:01:47 +10:00
parent 99ff0e64c5
commit 738bf9be9f
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend-common/imgui_fullscreen.cpp
View File

@ -234,6 +234,11 @@ void EndLayout()
ImGui::PopStyleVar(2);
}
bool IsCancelButtonPressed()
{
return ImGui::IsNavInputTest(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed);
}
bool BeginFullscreenColumns(const char* title)
{
ImGui::SetNextWindowPos(ImVec2(g_layout_padding_left, s_menu_bar_size));
@ -1135,7 +1140,7 @@ void DrawFileSelector()
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
LayoutScale(LAYOUT_MENU_BUTTON_X_PADDING, LAYOUT_MENU_BUTTON_Y_PADDING));
bool is_open = (ImGui::GetNavInputAmount(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed) < 1.0f);
bool is_open = !IsCancelButtonPressed();
bool directory_selected = false;
if (ImGui::BeginPopupModal(s_file_selector_title.c_str(), &is_open,
ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove))
@ -1251,7 +1256,7 @@ void DrawChoiceDialog()
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
LayoutScale(LAYOUT_MENU_BUTTON_X_PADDING, LAYOUT_MENU_BUTTON_Y_PADDING));
bool is_open = (ImGui::GetNavInputAmount(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed) < 1.0f);
bool is_open = !IsCancelButtonPressed();
s32 choice = -1;
if (ImGui::BeginPopupModal(s_choice_dialog_title.c_str(), &is_open,