Fix shop reroll button's horizontal movement (#316) (#425)

* Add optional exit indexes to selection grid rows & fix shop reroll button movement (#316)

- Added has_exit_idx and exit_idx to SelGridRowAttributes to simulate subgrid-like behavior that was desired in shop reroll button
- Add logic to use exit index if given inside selection_grid_move_selection_horz()
- Add joker focus logic to shop_reroll_row_on_selection_changed()

* clang-format fix

* clang format fix #2

errors due to version mismatch in local fixed (i hope)

* important fix: check x instead of y for next_roudn_btn_sel_x

was checking y against an X value

* changed commenting

* selection_grid.h clang-format fix

* changed commenting again

trying to make docs understandable

* set shop selection rows explicit

Co-authored-by: Rickey <ric@rf3.xyz>

* syntax fix

* clang format fix onceagain

* guard clause when moving down from jokers

---------

Co-authored-by: Rickey <ric@rf3.xyz>
This commit is contained in:
Umut Paklacı
2026-04-05 23:19:08 -07:00
committed by GitHub
co-authored by Rickey
parent 481a869ebc
commit 1e1394ec21
3 changed files with 40 additions and 10 deletions
+15 -7
View File
@@ -29,7 +29,14 @@ void selection_grid_move_selection_horz(SelectionGrid* selection_grid, int direc
return;
}
Selection new_selection = selection_grid->selection;
SelectionGridRow current_row = selection_grid->rows[selection_grid->selection.y];
// Choose the horizontal exit index if it exists
Selection new_selection =
current_row.attributes.has_h_exit_idx
? (Selection){selection_grid->selection.x, current_row.attributes.h_exit_idx}
: selection_grid->selection;
new_selection.x += direction_tribool;
int row_size = selection_grid->rows[new_selection.y].get_size();
bool wrap_enabled = selection_grid->rows[new_selection.y].attributes.wrap;
@@ -41,12 +48,13 @@ void selection_grid_move_selection_horz(SelectionGrid* selection_grid, int direc
if (wrap_enabled || (new_selection.x >= 0 && new_selection.x < row_size))
{
bool proceed_selection = selection_grid->rows[new_selection.y].on_selection_changed(
selection_grid,
new_selection.y,
&selection_grid->selection,
&new_selection
);
bool proceed_selection =
selection_grid->rows[selection_grid->selection.y].on_selection_changed(
selection_grid,
current_row.row_idx,
&selection_grid->selection,
&new_selection
);
if (proceed_selection)
{