Skip to content

fix(shell): redraw completed Wi-Fi timer state #590

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
boburning merged 1 commit into from
Aug 30, 2026
Merged

fix(shell): redraw completed Wi-Fi timer state #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions src/bloomShell/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4058,6 +4058,7 @@ int main(int argc, char **argv)
continue;
}
BloomUiAction action = BLOOM_UI_ACTION_NONE;
int wifi_redraw_event = event.type == WIFI_EVENT_TYPE;
if (event.type == MEDIA_EVENT_TYPE) {
if (!media_ready ||
!bloom_shell_media_runtime_handle_event(&media_runtime, &event,
Expand Down Expand Up @@ -4390,7 +4391,8 @@ int main(int argc, char **argv)
}
}
else if (bloom_shell_wifi_connect_lifecycle_controller_active(
&wifi_connect_lifecycle_controller))
&wifi_connect_lifecycle_controller) &&
!wifi_redraw_event)
continue;
else if (bloom_shell_wifi_recovery_controller_active(
&wifi_recovery_controller) &&
Expand All @@ -4404,7 +4406,8 @@ int main(int argc, char **argv)
action == BLOOM_UI_ACTION_BACK)
wifi_open = 0;
else if (bloom_shell_wifi_recovery_controller_active(
&wifi_recovery_controller))
&wifi_recovery_controller) &&
!wifi_redraw_event)
continue;
else if (wifi_forget_confirm_open &&
action == BLOOM_UI_ACTION_GAME_SWITCHER) {
Expand Down Expand Up @@ -4463,7 +4466,7 @@ int main(int argc, char **argv)
&wifi_connect_status_controller, forget_now))
wifi_forget_confirm_open = 0;
}
else if (wifi_forget_confirm_open)
else if (wifi_forget_confirm_open && !wifi_redraw_event)
continue;
else if (bloom_shell_wifi_forget_controller_active(
&wifi_forget_controller) &&
Expand Down Expand Up @@ -4501,7 +4504,8 @@ int main(int argc, char **argv)
wifi_forget_result = 0;
}
else if (bloom_shell_wifi_forget_controller_active(
&wifi_forget_controller))
&wifi_forget_controller) &&
!wifi_redraw_event)
continue;
else if (bloom_shell_wifi_profile_controller_active(
&wifi_profile_controller) &&
Expand Down Expand Up @@ -4592,7 +4596,8 @@ int main(int argc, char **argv)
bloom_shell_wifi_profile_controller_cycle_mode(
&wifi_profile_controller);
else if (bloom_shell_wifi_profile_controller_active(
&wifi_profile_controller))
&wifi_profile_controller) &&
!wifi_redraw_event)
continue;
else if (quick_settings && action == BLOOM_UI_ACTION_GAME_SWITCHER) {
quick_settings = 0;
Expand Down Expand Up @@ -4832,7 +4837,7 @@ int main(int argc, char **argv)
else
wifi_open = 0;
}
else if (wifi_open)
else if (wifi_open && !wifi_redraw_event)
continue;
else if (remote_key_remove_confirm_open &&
action == BLOOM_UI_ACTION_GAME_SWITCHER) {
Expand Down
2 changes: 2 additions & 0 deletions test/shell/bloom_shell_settings.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@
grep -F 'wifi_game_switcher_pending = 1;' "$shell"
grep -F '#define WIFI_EVENT_TYPE (SDL_USEREVENT + 2)' "$shell"
grep -F '_Static_assert(WIFI_EVENT_TYPE < SDL_NUMEVENTS,' "$shell"
grep -F 'int wifi_redraw_event = event.type == WIFI_EVENT_TYPE;' "$shell"
[ "$(grep -c '!wifi_redraw_event' "$shell")" -eq 6 ]
grep -F 'wifi_focus.selected == 0' "$shell"
grep -F 'BLOOM_SHELL_WIFI_CONTROLLER_COMPLETE' "$shell"
grep -F 'draw_wifi_profile_form(' "$shell"
Expand Down
Loading