yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
31406 Commits
Author SHA1 Message Date
Max Brunsfeld 78513a54a4 Add following UI in collab titlebar (#3544) 
* [x] restructure titlebar to show facepiles for each collaborator and
their followers
* [x] allow following collaborators by clicking their avatars in the
titlebar
* [x] show grayscale avatar for collaborators not focused on this
project
* [x] show collaborators' microphone activity and muted status in the
titlebar
* [x] in facepile, show leader in front of followers
 2023-12-07 14:38:30 -08:00
Max Brunsfeld cd33cb85d7 Add tooltip for following collaborators in titlebar 2023-12-07 14:31:21 -08:00
Max Brunsfeld cee6b17927 Order face pile front to back, left to right 2023-12-07 14:22:36 -08:00
Julia 5c1506f937 zed2: Port ProjectSharedNotification (#3545) 
Release Notes:

- N/A
 2023-12-07 17:21:24 -05:00
Max Brunsfeld 6a3785004a Indicate collaborators' presence (grayscale), speaking and muted status 2023-12-07 14:18:34 -08:00
Julia c45bf17ec8 zed2: Port ProjectSharedNotification 2023-12-07 17:13:22 -05:00
Max Brunsfeld 4200655585 Remove comments 2023-12-07 13:17:22 -08:00
Max Brunsfeld ce3b6b5ba5 In titlebar, render followers and allow following people 2023-12-07 13:09:18 -08:00
Marshall Bowers 2d053a6413 Pull editor inlay hints from VS Code themes 2023-12-07 15:36:13 -05:00
Marshall Bowers 540de8b583 Rename members in ZedSyntaxToken 2023-12-07 14:35:58 -05:00
Marshall Bowers e4dd8b3216 Remove commented-out code in theme importer 2023-12-07 14:33:37 -05:00
Marshall Bowers 5982a32d51 Remove padding from ButtonSize::None (#3541) 
This PR removes the padding from buttons when using `ButtonSize::None`.

This fixes the size of the tab close buttons.

Release Notes:

- N/A
 2023-12-07 14:11:30 -05:00
Joseph T. Lyons ce90079104 Fix bug with how characters limits are being displayed 2023-12-07 13:19:03 -05:00
Joseph T. Lyons cf0cf11c1f Merge branch 'feedback-modal-ui' of https://github.com/zed-industries/zed into feedback-modal-ui 2023-12-07 13:00:59 -05:00
Joseph T. Lyons 0d6fa0434f Skip using map 2023-12-07 13:00:49 -05:00
Nate Butler 970d1ef712 Remove static status bar icons 2023-12-07 12:59:51 -05:00
Joseph T. Lyons 72bbd5f17a Merge branch 'main' into feedback-modal-ui 2023-12-07 12:58:53 -05:00
Joseph T. LyonsandMarshall Bowers 1a4e5ea92d Remove when_else 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-07 12:37:07 -05:00
Marshall Bowers 35efac9839 Extract Tab component (#3539) 
This PR extracts a new `Tab` component from the tabs implementation in
the workspace.

This will allow us to reuse this component anywhere that we need to use
tabs.

Like our other newer components, the `Tab` component has a relatively
open API.

It accepts `children` (or `child`) as well as a `start_slot` and
`end_slot` to position content in the slots on either end of the
content. These slots also respect the `TabCloseSide` and will switch
positions based on this value.

<img width="763" alt="Screenshot 2023-12-07 at 12 19 42 PM"
src="https://github.com/zed-industries/zed/assets/1486634/78e4db6a-f807-431e-8777-f52f2631e6ed">

Release Notes:

- N/A
 2023-12-07 12:30:43 -05:00
Antonio Scandurra 2e9699f466 Don't panic when trying to reuse an existing workspace (#3538) 
Release Notes:

- N/A
 2023-12-07 18:23:33 +01:00
Antonio Scandurra fb0e0a49b1 Fix clipping when rendering paths (#3537) 
Release Notes:

- N/A
 2023-12-07 18:23:19 +01:00
Joseph T. Lyons eef6a641ac Add TODO 2023-12-07 12:04:04 -05:00
Piotr Osiewicz 1c26d3204b Do not render multibuffer without matches 2023-12-07 17:55:03 +01:00
Antonio ScandurraandNathan 0a7984edc6 Don't panic when trying to reuse an existing workspace 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-12-07 17:53:07 +01:00
Piotr Osiewicz dab0e2b6b4 Render multibuffer 2023-12-07 17:48:53 +01:00
Antonio ScandurraandNathan 7356b18452 Fix clipping when rendering paths 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-12-07 17:48:00 +01:00
Nate Butler b616789646 WIP 
[no-ci]
 2023-12-07 10:50:07 -05:00
Piotr Osiewicz 5a6e26628c Searches work, but the results are not displayed 2023-12-07 16:43:34 +01:00
Piotr Osiewicz 4f7cb770e0 WIP, search bar looks kinda okay 2023-12-07 16:26:40 +01:00
Kirill Bulatov 1df838c88d Add initial OS file drag and drop support 2023-12-07 16:08:48 +02:00
Kirill Bulatov e21e3e4f3b Activate Zed window on external file drop 2023-12-07 16:08:47 +02:00
Kirill Bulatov e4b11bdee6 Do not expand terminal selections on active drag 2023-12-07 16:08:47 +02:00
Kirill Bulatov 25243121af Convert OS file drag and drop enter event into a mouse move, not mouse click 2023-12-07 16:08:47 +02:00
Kirill Bulatov eb5349ce5b Suppress unused variable r-a warning from action derive procmacro 2023-12-07 16:08:47 +02:00
Kirill Bulatov a6d6160268 Move actions to namespaces used in zed1 keybinding settings 2023-12-07 16:08:47 +02:00
Kirill Bulatov 615b2dc06d Do not panic when focusing empty dock 2023-12-07 16:08:47 +02:00
Piotr Osiewicz 95814ab53b Barebones project search (no UI, but the crate compiles) 2023-12-07 14:36:45 +01:00
Piotr Osiewicz 182ea495bf Search2 fixups (#3533) 
Fixes several issues with focus and unbound actions.
Release Notes:

- N/A
 2023-12-07 14:01:21 +01:00
Piotr Osiewicz 6528d8e87f Remove unused import 2023-12-07 13:54:51 +01:00
Piotr Osiewicz 5c5d6cdcf6 fixup! buffer search: Fix up rough edges 2023-12-07 13:13:38 +01:00
Antonio Scandurra 67a00e0920 Fix confirming rename not working on editor2 2023-12-07 12:54:28 +01:00
Piotr Osiewicz 307a3d1ae2 buffer search: Fix up rough edges 
Focus query editor when Deploy::focused is true, add missing bindings
 2023-12-07 12:52:34 +01:00
Antonio Scandurra fa96a6e5a8 Rework frame rendering 
This commit replaces the old `previous_frame` and `current_frame` with
a new pair of `rendered_frame` and `next_frame` that are swapped once
we are ready to draw a finished frame.

This makes it clearer when to use which: `rendered_frame` should be used
to query the existing state, whereas `next_frame` should be used and mutated when
redrawing a dirty window.

The change was prompted by a bug I encountered in `FocusHandle::contains`. The
implementation was reading `current_frame`, but that was the wrong field to
access if e.g. we were reading it inside of a `render` function or any other
time while drawing the window.
 2023-12-07 12:10:49 +01:00
Antonio Scandurra 75c456997f Use the correct icons in AssistantPanel header 2023-12-07 10:53:24 +01:00
Antonio Scandurra 0ab459a950 Simplify focus management in AssistantPanel 2023-12-07 10:38:00 +01:00
Antonio Scandurra 070da1be20 Ensure editor gets focused when selecting conversation 2023-12-07 10:27:25 +01:00
Federico Dionisi 5b796d32d0 Dismiss theme_selector on esc (#3502) 2023-12-07 09:07:13 +01:00
Nate Butler 5f4e9710ab WIP 2023-12-07 01:46:28 -05:00
Nate Butler 240e8cc12e Add row-reverse and col-reverse to styled 2023-12-07 01:17:18 -05:00
Nate Butler 20cfbb2abe checkpoint 2023-12-07 00:33:24 -05:00