fix(windows): hover-effect-fix-in-the-branch-ui

[shivamhwp]

What Changed

• Cherry-picked the original author's branch-switch hover fix work from fix(windows): windows branch switch ui broken #1038 onto current main
• Kept that original commit stack intact for attribution
• Applied one follow-up fix so the selected branch state stays visually distinct from the actively hovered/highlighted row

Why

The original work in #1038 fixed most of the Windows hover-state problem, but the final branch-selector override still made data-selected and data-highlighted collapse into the same full-accent treatment.

This PR preserves the original author's work directly and adds the minimal follow-up needed so:

• selected rows use the subtler shared selected styling
• highlighted rows keep the stronger active hover/highlight styling
• the branch selector no longer overrides shared state styling back into the original ambiguity

Notes

• Original work preserved from fix(windows): windows branch switch ui broken #1038
• Follow-up fix is the final commit on top of that stack
• Fixes [Bug] Windows branch switch UI does not show hover effect correctly #1040

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Low Risk
Low risk CSS-only changes that adjust hover/selected styling for list items; main risk is minor visual regressions across components using ComboboxItem/AutocompleteItem.

Overview
Fixes branch selector (and other list pickers) so hover/highlight and selected states render distinctly, improving Windows hover behavior.

Moves hover/selected styling into the shared ComboboxItem and AutocompleteItem base classes (adds hover:bg-accent, data-selected:bg-accent/50, and explicit combined highlighted+selected rules) and removes the BranchToolbarBranchSelector per-item className override that previously forced full-accent styling for the active branch.

^{Written by Cursor Bugbot for commit acfedc1. This will update automatically on new commits. Configure here.}

Note

Fix hover and selected state styles in branch selector, combobox, and autocomplete items

• Adds hover:bg-accent, data-selected:bg-accent/50, and data-selected:text-foreground to ComboboxItem and AutocompleteItem so these states are handled by the components themselves.
• Removes the manual active-style override in BranchToolbarBranchSelector that previously applied bg-accent text-foreground when an item matched the active branch, deferring to the component's own state classes.
• When an item is both highlighted and selected, highlighted styles take precedence.

^{Macroscope summarized acfedc1.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 1011ac85-058e-43fe-aa9f-5c1fada62c37

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

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

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}