Skip to content

fix(settings): move wrongly grouped keybinds - #6308

Merged
evanpelle merged 1 commit into
mainfrom
fix-keybindpositions
Nov 6, 2026
Merged

evanpelle merged 1 commit into
mainfrom
fix-keybindpositions

Conversation

@VariableVince

@VariableVince VariableVince commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Description:

Moves Emoji Menu and Quick chat from Ally Keybinds to Menu Shortcuts. And Box-Select Warships and Select All Warships from Menu Shortcuts to the bottom of Attack Keybinds. This groups these controls by purpose:

  • Warship selection with Attack Controls (since they're not Menu Shortcuts, they are attack actions of their own that are in no menu. Also original closed PR Fix: Missing binds in settings #3963 had similar ones under Attack Keybinds before merged Feat: add missing keybinds F, R and box-select-warship to customizable keybinds #4989 put them elsewhere months later.)
  • Chat/emoji menu shortcuts with other Menu Shortcuts (the emoji and build menu modifier keys where already under Menu Shortcuts, and you can send chats/emojis to enemies not only to allies to Ally Keybinds seemed like the wrong place for them to be).
image image

Please complete the following:

  • I have added screenshots for all UI updates
  • I process any text displayed to the user through translateText() and I've added it to the en.json file (no new text was introduced)
  • I have added relevant tests to the test directory (this is a layout-only reorder)

Please put your Discord username so you can be contacted if a bug or regression is found:

tryout33

@coderabbitai

coderabbitai Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The keybind settings now place emoji-menu and quick-chat controls in the menu-shortcuts section. Box-select and select-all warship controls are in the attack-keybind section. Their keybind settings are retained.

Changes

Client input and settings

Layer / File(s) Summary
Keybind control layout
src/client/UserSettingModal.ts
The emoji-menu and quick-chat controls move to menu shortcuts. The box-select and select-all warship controls move to attack keybinds. Box-select continues to allow modifiers.

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Bug fix

Suggested labels: UI/UX, Bug, small-fix

Suggested reviewers: celant

Merge Risk: Minimal · up to b4347

The shortcuts are regrouped without changing their bindings. Assign a milestone to clear the required check.

Pre-merge checks: Passed 5

Check name Status Explanation
Docstring Coverage Passed No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Title check Passed The title clearly describes the keybind regrouping.
Description check Passed The description accurately identifies the keybind groups that were changed.
Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 1 files.

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

Emoji shortcuts find their place
Quick chat joins the menu
Warship controls move to attack keys
Box-select keeps its modifiers
Each keybind stays in place

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 0a4521d8-d5c3-4d25-bcd3-203aa4de2650
Commits

Reviewing files that changed from the base of the PR and between 641e462 and b43470a.

Files selected for processing: 1

  • src/client/UserSettingModal.ts

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 6 remain after this review.

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🤖 Claude Code Review

Verdict: No blocking issues. Findings: 0 critical, 0 major, 0 minor.

No issues found. Checked for bugs and CLAUDE.md compliance.

What I checked:

  • keysMayBeShared(a, b, key) with the new modifier prefixes works the same as the old ALLOWED_SHARED_MODIFIERS check in UserSettingModal. The other call site in UserSettings.ts doesn't pass a key, which leaves its behaviour unchanged.
  • GameView.isPaused() only reads the latest tick's GamePaused updates. That holds up because GameServer and LocalServer stop sending turns while paused, so the last update stays the one that paused the game.
  • The removed build_*_desc keys have no remaining uses after the switch to build_hotkey_desc, and only en.json was changed.

Note: the PR description calls this a layout-only reorder, but the diff also changes behaviour. Repeated build hotkeys are now ignored while the view hasn't synced, is catching up or is paused, and the shared-modifier logic moved. Please update the description to say so.

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🤖 Claude Code Review

Verdict: No blocking issues. Findings: 0 critical, 0 major, 0 minor.

No issues found. Checked for bugs and CLAUDE.md compliance.

What I checked:

  • The diff only moves four <setting-keybind> blocks in src/client/UserSettingModal.ts. Each moved block is identical to the one it replaces: same action, labels, defaultKey binding, .allowModifiers on boxSelectWarships, and @change handler. Nothing was added or lost.
  • No new user-visible text, so translateText() and en.json need no changes.

Note: the description says Emoji Menu and Quick Chat move to the bottom of Menu Shortcuts. They actually land in the middle, after emojiMenuModifier and before pauseGame/gameSpeedUp/gameSpeedDown. That position next to the emoji modifier is reasonable, but please make the description match. Box-Select and Select All Warships do end up at the bottom of Attack Keybinds, after swapDirection.

coderabbitai[bot]

This comment was marked as outdated.

@github-project-automation github-project-automation Bot moved this from Triage to Development in OpenFront Release Management Nov 6, 2026
@VariableVince

Copy link
Copy Markdown
Contributor Author

@coderabbitai full review

@coderabbitai

coderabbitai Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor
Action performed

Full review finished.

@VariableVince

Copy link
Copy Markdown
Contributor Author

/ready

@VariableVince VariableVince changed the title fix(settings): group keybinds by purpose fix(settings): move wrongly grouped keybinds Nov 6, 2026

@Celant Celant left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pure move, same four rows in better homes. Fine by me.

@github-project-automation github-project-automation Bot moved this from Development to Final Review in OpenFront Release Management Nov 6, 2026
@evanpelle evanpelle added this to the v36 milestone Nov 6, 2026
@evanpelle
evanpelle merged commit 66a5e98 into main Nov 6, 2026
20 of 25 checks passed
@evanpelle
evanpelle deleted the fix-keybindpositions branch November 6, 2026 19:14
@github-project-automation github-project-automation Bot moved this from Final Review to Complete in OpenFront Release Management Nov 6, 2026

This branch was successfully deployed

1 active and 1 inactive deployments
backport — b43470ad Deployed Nov 6, 2026 by evanpelle via Cherry-pick #900
staging — b43470ad Deployed Nov 6, 2026 by openfrontio[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

3 participants