preserve-emulation/Vita3K
1
0
Fork 0
mirror of https://github.com/Vita3K/Vita3K.git synced 2026-07-11 01:34:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/start screen: Fix open user with controller.

Browse Source 
- Small refactor for blocking double click on button.
- Fix hide info bar when option is disable.
- Fix input is now also blocked on controller while the gate animation is playing.
This commit is contained in:
Zangetsu38
2026-04-08 04:05:13 +02:00
committed by Zangetsu
parent 5ad523fc9a
commit 7cfe7cc229
3 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vita3k/gui/include/gui/functions.h
+1
View File
@@ -44,6 +44,7 @@ void browse_save_data_dialog(GuiState &gui, EmuEnvState &emuenv, const uint32_t
void browse_users_management(GuiState &gui, EmuEnvState &emuenv, const uint32_t button);
void close_and_run_new_app(EmuEnvState &emuenv, const std::string &app_path);
void close_live_area_app(GuiState &gui, EmuEnvState &emuenv, const std::string &app_path);
void close_start_screen(GuiState &gui, EmuEnvState &emuenv);
void close_system_app(GuiState &gui, EmuEnvState &emuenv);
void delete_app(GuiState &gui, EmuEnvState &emuenv, const std::string &app_path);
void destroy_bgm_player();
vita3k/gui/src/themes.cpp
+11 -8
View File
@@ -309,7 +309,7 @@ bool init_theme(GuiState &gui, EmuEnvState &emuenv, const std::string &content_i
LOG_WARN("Notice icon, Name: '{}', Not found for content id: {}.", name, content_id);
continue;
}
stbi_uc *data = stbi_load_from_memory(&buffer[0], static_cast<int>(buffer.size()), &width, &height, nullptr, STBI_rgb_alpha);
stbi_uc *data = stbi_load_from_memory(buffer.data(), static_cast<int>(buffer.size()), &width, &height, nullptr, STBI_rgb_alpha);
if (!data) {
LOG_ERROR("Invalid notice icon for content id: {}.", content_id);
continue;
@@ -459,6 +459,14 @@ void draw_background(GuiState &gui, EmuEnvState &emuenv) {
}
}
void close_start_screen(GuiState &gui, EmuEnvState &emuenv) {
gui.vita_area.start_screen = false;
switch_bgm_state(false);
gui.vita_area.home_screen = true;
if (!emuenv.cfg.show_info_bar)
gui.vita_area.information_bar = false;
}
void draw_start_screen(GuiState &gui, EmuEnvState &emuenv) {
const ImVec2 VIEWPORT_SIZE(emuenv.logical_viewport_size.x, emuenv.logical_viewport_size.y);
const ImVec2 VIEWPORT_POS(emuenv.logical_viewport_pos.x, emuenv.logical_viewport_pos.y);
@@ -540,13 +548,8 @@ void draw_start_screen(GuiState &gui, EmuEnvState &emuenv) {
}
ImGui::PopFont();
if (ImGui::IsWindowHovered(ImGuiFocusedFlags_RootWindow) && ImGui::IsMouseClicked(0)) {
gui.vita_area.start_screen = false;
switch_bgm_state(false);
gui.vita_area.home_screen = true;
if (emuenv.cfg.show_info_bar)
gui.vita_area.information_bar = true;
}
if (ImGui::IsWindowHovered(ImGuiFocusedFlags_RootWindow) && ImGui::IsMouseClicked(0))
close_start_screen(gui, emuenv);
ImGui::End();
ImGui::PopStyleVar(3);
vita3k/interface.cpp
+47 -47
View File
@@ -603,6 +603,48 @@ bool handle_events(EmuEnvState &emuenv, GuiState &gui) {
const auto allow_switch_state = !emuenv.io.title_id.empty() && !gui.vita_area.app_close && !gui.vita_area.home_screen && !gui.vita_area.user_management && !gui.configuration_menu.custom_settings_dialog && !gui.configuration_menu.settings_dialog && !gui.controls_menu.controls_dialog && gui::get_sys_apps_state(gui);
const auto ui_navigation = [&emuenv, &gui, allow_switch_state](const uint32_t sce_ctrl_btn) {
switch (sce_ctrl_btn) {
case SCE_CTRL_CROSS:
case SCE_CTRL_CIRCLE:
gui.is_key_locked = true;
if (gui.vita_area.start_screen)
gui::close_start_screen(gui, emuenv);
break;
case SCE_CTRL_PSBUTTON:
gui.is_key_locked = true;
if (allow_switch_state) {
// Show/Hide Live Area during app running
const auto current_app_state = emuenv.kernel.is_threads_paused();
const auto live_area_app_index = gui::get_live_area_current_open_apps_list_index(gui, emuenv.io.app_path);
if (live_area_app_index == gui.live_area_current_open_apps_list.end())
gui::open_live_area(gui, emuenv, emuenv.io.app_path);
else {
// If current live area app open is not the current app running, set it as current
if ((gui.live_area_app_current_open < 0) || (gui.live_area_current_open_apps_list[gui.live_area_app_current_open] != emuenv.io.app_path))
gui.live_area_app_current_open = static_cast<int32_t>(std::distance(live_area_app_index, gui.live_area_current_open_apps_list.end()) - 1);
// Switch Live Area state
if (!gui.vita_area.live_area_screen) {
gui.vita_area.information_bar = true;
gui.vita_area.live_area_screen = true;
}
}
if (!current_app_state) {
// Update the last app frame for live area
update_live_area_last_app_frame(emuenv, gui);
gui.gate_animation.start(GateAnimationState::ReturnApp);
app::switch_state(emuenv, !current_app_state);
gui::switch_bgm_state(!current_app_state);
} else {
gui.gate_animation.start(GateAnimationState::EnterApp);
}
} else if (!gui::get_sys_apps_state(gui))
gui::close_system_app(gui, emuenv);
break;
default: break;
}
if (gui.vita_area.app_close) {
const auto cancel = [&gui]() {
gui.vita_area.app_close = false;
@@ -643,52 +685,6 @@ bool handle_events(EmuEnvState &emuenv, GuiState &gui) {
default: break;
}
}
switch (sce_ctrl_btn) {
case SCE_CTRL_CROSS:
case SCE_CTRL_CIRCLE:
gui.is_key_locked = true;
if (gui.vita_area.start_screen) {
gui.vita_area.start_screen = false;
gui.vita_area.home_screen = true;
if (emuenv.cfg.show_info_bar)
gui.vita_area.information_bar = true;
}
break;
case SCE_CTRL_PSBUTTON:
gui.is_key_locked = true;
if (allow_switch_state) {
// Show/Hide Live Area during app running
const auto current_app_state = emuenv.kernel.is_threads_paused();
const auto live_area_app_index = gui::get_live_area_current_open_apps_list_index(gui, emuenv.io.app_path);
if (live_area_app_index == gui.live_area_current_open_apps_list.end())
gui::open_live_area(gui, emuenv, emuenv.io.app_path);
else {
// If current live area app open is not the current app running, set it as current
if ((gui.live_area_app_current_open < 0) || (gui.live_area_current_open_apps_list[gui.live_area_app_current_open] != emuenv.io.app_path))
gui.live_area_app_current_open = static_cast<int32_t>(std::distance(live_area_app_index, gui.live_area_current_open_apps_list.end()) - 1);
// Switch Live Area state
if (!gui.vita_area.live_area_screen) {
gui.vita_area.information_bar = true;
gui.vita_area.live_area_screen = true;
}
}
if (!current_app_state) {
// Update the last app frame for live area
update_live_area_last_app_frame(emuenv, gui);
gui.gate_animation.start(GateAnimationState::ReturnApp);
app::switch_state(emuenv, !current_app_state);
gui::switch_bgm_state(!current_app_state);
} else {
gui.gate_animation.start(GateAnimationState::EnterApp);
}
} else if (!gui::get_sys_apps_state(gui))
gui::close_system_app(gui, emuenv);
break;
default: break;
}
};
// Check if any settings or controls dialog is open and drop inputs on this case
@@ -813,7 +809,7 @@ bool handle_events(EmuEnvState &emuenv, GuiState &gui) {
if (!emuenv.kernel.is_threads_paused() && (event.gbutton.button == SDL_GAMEPAD_BUTTON_TOUCHPAD))
toggle_touchscreen();
if (ImGui::GetIO().WantTextInput || emuenv.drop_inputs)
if (ImGui::GetIO().WantTextInput || gui.is_key_locked || emuenv.drop_inputs || (gui.gate_animation.state != GateAnimationState::None))
continue;
for (const auto &binding : get_controller_bindings_ext(emuenv)) {
@@ -829,6 +825,10 @@ bool handle_events(EmuEnvState &emuenv, GuiState &gui) {
}
break;
case SDL_EVENT_GAMEPAD_BUTTON_UP:
gui.is_key_locked = false;
break;
case SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN:
case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION:
case SDL_EVENT_GAMEPAD_TOUCHPAD_UP: