Visitar URL original
Z-2276/Z-2275: Project & Branch switchers by osiewicz · Pull Request #2662 · zed-industries/zed · GitHub
Skip to content

Z-2276/Z-2275: Project & Branch switchers - #2662

Merged
iamnbutler merged 36 commits into
mainfrom
git-menu
Jul 5, 2023
Merged

iamnbutler merged 36 commits into
mainfrom
git-menu

Conversation

@osiewicz

Copy link
Copy Markdown
Member

This PR adds project and branch switchers in top left corner.

Release Notes:

  • Added a project & branch switcher under project name.

@linear

linear Bot commented Jun 29, 2023

Copy link
Copy Markdown
Z-2275 Project Switcher

This menu is launched by clicking on the project title

  • Switch between open/recent projects
  • Type to find a project
  • Enterswitches you to that project
  • When streaming: Switch between shared branches on the call (This is being moved to another menu, WIP)

Here is what the project menu looks like:

Collaboration UI - Single Player Switchers - Project – Collaboration UI (Figma)

Z-2276 Branch Switcher

Launched by clicking on the branch name in the titlebar.

Offers an affordance to switch between recently active local branches.

Branch Switcher

  • Add a SectionHeader to popover menus
  • Add a list of recent branches
  • enter swaps you to that branch
  • git error/reason couldn't switch could open terminal (Nate: Not really sure about this)

Find a branch

  • Type to find a branch
  • Matched text is highlighted
  • Item to create new branch from input text

Likely PRs are out of scope for this iteration of the branch switcher but wanted to show how we might show them for future use.

Looks like this:

Collaboration UI - Single Player Switchers - Project – Collaboration UI (Figma)

osiewicz and others added 8 commits July 5, 2023 14:04
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
Get rid of superfluous params in RenderParams related to hover & click state.

Co-authored-by: Antonio <antonio@zed.dev>
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
@iamnbutler

Copy link
Copy Markdown
Contributor

There is some follow up design polish I want to do on this, but it isn't blocking. I'm ready to merge this.

@iamnbutler
iamnbutler merged commit 76873c5 into main Jul 5, 2023
@iamnbutler
iamnbutler deleted the git-menu branch July 5, 2023 17:09
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
This PR adds project and branch switchers in top left corner. 

Release Notes:
- Added a project & branch switcher under project name.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants