yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,479 Commits 5 Branches 0 Tags
e82fd00a0f7290a4dc5a995b5bd8a99f211ec16a
Commit Graph
107 Commits
Author SHA1 Message Date
Max Brunsfeld 720b910a67 Show current user avatar when in a room w/o a shared project 2023-12-07 14:49:32 -08:00
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
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
Nate Butler 6f5d8dbc4a Update pickers to have a consistently larger size 2023-12-06 23:38:47 -05:00
Max Brunsfeld 9cbecfd534 Initialize channel notes to register the view as followable 2023-12-06 12:09:29 -08:00
Max Brunsfeld 7d02e1b34a Allow opening channel notes from the channel list 2023-12-06 12:09:29 -08:00
Max Brunsfeld 0573c35281 Bring back channel notes 2023-12-06 12:09:27 -08:00
Antonio Scandurra c9300e2384 Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Max Brunsfeld 802a517228 Render chat and notes buttons below the current channel 2023-12-05 10:40:51 -08:00
Max Brunsfeld 2461eb0b6f Fix rendering of shared screens in collab panel 2023-12-05 10:29:19 -08:00
Max Brunsfeld 8493032c8a Fix tree branch rendering in collab panel 2023-12-05 10:14:40 -08:00
Antonio Scandurra 6688546075 WIP 2023-12-05 16:49:36 +01:00
Max Brunsfeld 63fa23813f Enable more collab UI features (#3496) 
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
 2023-12-04 18:01:11 -08:00
Max BrunsfeldandNathan c90503de59 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Max Brunsfeld 42aaec9d32 Revert "Decouple workspace from call (#3380)" 
This reverts commit 2df0a46cbe, reversing
changes made to 2704b92d2e.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00
Max BrunsfeldandNathan 8ec74dbaf5 Allow sharing projects 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Max BrunsfeldandNathan debcb52436 Start bringing back the current call section of the collab panel 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Conrad Irwin 0b142a2b3b Get ChannelModal opening 2023-12-02 00:57:41 -07:00
Nate Butler 26a34fe62f Update collab_titlebar_item.rs 2023-12-01 10:52:11 -05:00
Nate Butler a24d4920fd Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00
Conrad Irwin f139380986 Rename menu_handle to right_click_menu and child to trigger 
This makes things more in-line with `popover_menu`.
 2023-11-30 16:39:43 -07:00
Conrad Irwin c948ffad89 Flesh out a popover control 2023-11-30 16:13:44 -07:00
Marshall Bowers 70e0762838 Rework ListHeader to be more open (#3467) 
This PR reworks the `ListHeader` component to be more open.

The `meta` method can now be used to append meta items of any element to
the `ListHeader`, and they will be rendered with the appropriate spacing
between them.

Release Notes:

- N/A
 2023-11-30 15:55:31 -05:00
Nate Butler 4a4298df17 Update collab_titlebar_item.rs 2023-11-30 14:55:59 -05:00
Nate Butler 0a836c7934 WIP update popover_menu 2023-11-30 14:54:44 -05:00
Nate Butler 8d35aa34d4 Remove unused import 2023-11-30 13:13:22 -05:00
Nate Butler 98ed3b9a2f Clean up left side titlebar buttons 2023-11-30 13:11:20 -05:00
Nate ButlerandPiotr Osiewicz ba0753d410 Add render_project_name and render_project_branch 
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
 2023-11-30 12:51:55 -05:00
Nate ButlerandPiotr Osiewicz c8126846f6 Scaffold out render_project_owner 
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
 2023-11-30 12:41:17 -05:00
Marshall Bowers 16e5a3e4d5 Rename button-related enums (#3463) 
This PR renames the `ButtonStyle2` and `ButtonSize2` enums to
`ButtonStyle` and `ButtonSize`, respectively.

Release Notes:

- N/A
 2023-11-30 12:04:23 -05:00
Nate Butler 26f1630ff8 Update collab_titlebar_item.rs 
[no ci]
 2023-11-30 09:44:33 -05:00
Nate Butler a9d4e19650 Start plugging selected states into collab ui 2023-11-30 09:35:37 -05:00
Nate Butler 0953738f9d Update collab button styles 2023-11-30 09:12:39 -05:00
Antonio Scandurra dce8677ea7 Merge remote-tracking branch 'origin/main' into surfaces 
# Conflicts:
#	crates/ui2/src/components/avatar.rs
 2023-11-30 10:48:20 +01:00
Conrad Irwin aba461c668 Restore logical offset preservation behaviour 2023-11-29 23:51:31 -07:00
Conrad Irwin 8ac382ce58 Keybaord shortcut context menu 2023-11-29 23:04:33 -07:00
Conrad Irwin 1c2d7698f9 Scroll the collab panel when keyboard focusing 2023-11-29 22:39:15 -07:00
Nate Butler fe80b7a347 WIP 2023-11-30 00:28:05 -05:00
Conrad Irwin 70d38fa7ce Add a ScrollHandle to gpui2 for the collab panel 2023-11-29 22:20:06 -07:00
Conrad Irwin 530c3a30cc Add filtering support 2023-11-29 20:58:15 -07:00
Conrad Irwin a3da146926 Merge branch 'main' into collab-panel2 2023-11-29 16:32:25 -07:00
Marshall Bowers b0bc31b883 Add new Button and IconButton components (#3448) 
This PR adds new `Button` and `IconButton` components built on top of
our new button abstractions.

Both of these buttons are built from the common `ButtonLike` base, and
implement the `ButtonCommon` (name TBD) trait in order to provide a
common interface.

There are still some visual tweaks that we'll need to make to the new
buttons, but those should be straightforward to make after we land this.

Release Notes:

- N/A
 2023-11-29 17:41:44 -05:00
Conrad Irwin 19f550c129 Merge branch 'main' into collab-panel2 2023-11-29 15:40:16 -07:00
Conrad Irwin 1210422a86 Scrollyscrolly 2023-11-29 15:30:50 -07:00
Conrad Irwin b905ce7ccf Fix mouse interaction on contact subsections 2023-11-29 15:26:19 -07:00