Skip to content

theme_selector: Mark the active theme with a check icon - #58404

Merged
dinocosta merged 4 commits into
zed-industries:mainfrom
mateioprea:feat/theme_selector/mark-active-theme
Jun 3, 2026
Merged

theme_selector: Mark the active theme with a check icon#58404
dinocosta merged 4 commits into
zed-industries:mainfrom
mateioprea:feat/theme_selector/mark-active-theme

Conversation

@mateioprea

@mateioprea mateioprea commented Jun 3, 2026 •
edited by dinocosta
Loading

Copy link
Copy Markdown
Contributor

While browsing themes in theme selector, the currently active theme will always be marked with a check icon so you can always have a reference of where you started from.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Here's a preview:
Screenshot 2026-06-03 at 13 09 46
Screenshot 2026-06-03 at 13 09 52

Release Notes:

  • Improved the theme and icon selectors to display a check next to the active theme

@mateioprea
theme_selector: Mark the active theme with a check icon
dae8d9e 
While browsing themes in theme selector, the currently active theme will
always be marked with a check icon so you can always have a reference of
where you started from.
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 3, 2026
@widersky

widersky commented Jun 3, 2026

Copy link
Copy Markdown

Maybe would be good to highlight choosen theme too?

@mateioprea

mateioprea commented Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

Maybe would be good to highlight choosen theme too?

that already happens when you hover a theme in the selector

@dinocosta dinocosta added the area:ui/themes Feedback for theme configuration, accessibility, visual issues, etc label Jun 3, 2026
dinocosta added 3 commits June 3, 2026 14:00
@dinocosta
refactor(theme_selector): use end slot, muted icon color and id
86674cc 
* Refactor how tracking and comparing the original theme is done in
  order to use its id instead of string comparison
* Refactor how the check icon is used for the active theme in order to
  leverage `ListItem::end_slot`
* Use `Color::Muted` for the check icon, similar to what we're doing for
  `line ending selector: toggle`
@dinocosta
feat(theme_selector): show check next to original icon theme
f031c60
@dinocosta
docs(theme_selector): fix field documentation
272fe30
@dinocosta dinocosta self-assigned this Jun 3, 2026
dinocosta
dinocosta approved these changes Jun 3, 2026
View reviewed changes

@dinocosta dinocosta 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.

Thank you @mateioprea !

I've refactored the solution a little bit and decided to also add it to the icon theme selector 🙂

@dinocosta
dinocosta enabled auto-merge June 3, 2026 13:51
@dinocosta
dinocosta added this pull request to the merge queue Jun 3, 2026
Merged via the queue into zed-industries:main with commit 3f0d233 Jun 3, 2026
33 checks passed
@mateioprea

mateioprea commented Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

Thank you @mateioprea !

I've refactored the solution a little bit and decided to also add it to the icon theme selector 🙂

Perfect! Thank you for that. I'm slowly learning Rust by fixing issues that I see in Zed 😄

TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 8, 2026
@mateioprea @dinocosta @TomPlanche
theme_selector: Mark the active theme with a check icon (zed-industri…
13a1c67 
…es#58404)

While browsing themes in theme selector, the currently active theme will
always be marked with a check icon so you can always have a reference of
where you started from.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Here's a preview: 
<img width="950" height="806" alt="Screenshot 2026-06-03 at 13 09 46"
src="https://github.com/user-attachments/assets/2081d9ec-b56d-4542-be58-e59e3569bc7a"
/>
<img width="958" height="818" alt="Screenshot 2026-06-03 at 13 09 52"
src="https://github.com/user-attachments/assets/134d933f-c9de-4b2c-80f5-ed5be4fb2844"
/>


Release Notes:

- Improved the theme and icon selectors to display a check next to the
active theme

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
This was referenced Jun 10, 2026
Open
Open
This was referenced Jun 18, 2026
Closed
Closed
@github-actions github-actions Bot mentioned this pull request Jun 24, 2026
Open
This was referenced Jul 1, 2026
Open
Open
This was referenced Jul 10, 2026
Open
Open
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
@mateioprea @dinocosta
theme_selector: Mark the active theme with a check icon (zed-industri…
948e151 
…es#58404)

While browsing themes in theme selector, the currently active theme will
always be marked with a check icon so you can always have a reference of
where you started from.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Here's a preview: 
<img width="950" height="806" alt="Screenshot 2026-06-03 at 13 09 46"
src="https://github.com/user-attachments/assets/2081d9ec-b56d-4542-be58-e59e3569bc7a"
/>
<img width="958" height="818" alt="Screenshot 2026-06-03 at 13 09 52"
src="https://github.com/user-attachments/assets/134d933f-c9de-4b2c-80f5-ed5be4fb2844"
/>


Release Notes:

- Improved the theme and icon selectors to display a check next to the
active theme

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
@mateioprea @dinocosta
theme_selector: Mark the active theme with a check icon (zed-industri…
f9bb5a5 
…es#58404)

While browsing themes in theme selector, the currently active theme will
always be marked with a check icon so you can always have a reference of
where you started from.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Here's a preview: 
<img width="950" height="806" alt="Screenshot 2026-06-03 at 13 09 46"
src="https://github.com/user-attachments/assets/2081d9ec-b56d-4542-be58-e59e3569bc7a"
/>
<img width="958" height="818" alt="Screenshot 2026-06-03 at 13 09 52"
src="https://github.com/user-attachments/assets/134d933f-c9de-4b2c-80f5-ed5be4fb2844"
/>


Release Notes:

- Improved the theme and icon selectors to display a check next to the
active theme

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dinocosta dinocosta dinocosta approved these changes

Assignees

@dinocosta dinocosta

Labels

area:ui/themes Feedback for theme configuration, accessibility, visual issues, etc cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mateioprea @widersky @dinocosta