Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex committed Mar 22, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 63b6044 commit d2e9396
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions app/src/input_manager.c
Original file line number Diff line number Diff line change
@@ -632,23 +632,23 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
if (controller) {
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;

if (control && event->button == 7) {
if (event->button == 7) {
action_app_switch(controller, action);
return;
}
if (control && event->button == SDL_BUTTON_X2 && down) {
if (event->button == SDL_BUTTON_X2 && down) {
if (event->clicks < 2) {
expand_notification_panel(controller);
} else {
expand_settings_panel(controller);
}
return;
}
if (control && (event->button == SDL_BUTTON_RIGHT || event->button == SDL_BUTTON_X1)) {
if (event->button == SDL_BUTTON_RIGHT || event->button == SDL_BUTTON_X1) {
press_back_or_turn_screen_on(controller, action);
return;
}
if (control && event->button == SDL_BUTTON_MIDDLE) {
if (event->button == SDL_BUTTON_MIDDLE) {
action_home(controller, action);
return;
}

0 comments on commit d2e9396

Please sign in to comment.