Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15999 commits 1103 branches 1111 tags 398 MiB
Commit graph

85 commits

Author SHA1 Message Date
Antonio Scandurra
dd84993d76 Maintain scroll position in CollabPanel after updating entries 
Co-Authored-By: Julia <julia@zed.dev>
 2023-12-19 16:06:00 +01:00
Marshall Bowers
4fdf6a867a
Wire up offline contact list (#3700) 
This PR wires up the offline contact list.

Also enables toggling both the online and offline contact lists.

Release Notes:

- N/A
 2023-12-18 13:54:11 -05:00
Nate Butler
9d014b0f9a Remove comment 2023-12-18 13:11:51 -05:00
Nate Butler
89b231afeb Update collab panel signed out state 2023-12-18 13:09:46 -05:00
Nate Butler
196df1c378 Start on collab panel empty state 2023-12-18 11:33:37 -05:00
Marshall Bowers
5447c6d5ee
Fix channel filter input (#3686) 
This PR fixes the channel filter in the collab panel not showing up.

Release Notes:

- N/A
 2023-12-15 17:03:59 -05:00
Marshall Bowers
5c060ceb1c Format code 2023-12-15 14:03:49 -05:00
Marshall Bowers
5417127902 Fix channel drag and drop 
Also add the ability to unnest a channel by dragging it to the "Channels"
header. This is currently not working due to a collab server issue.

Co-authored-by: Max <max@zed.dev>
 2023-12-15 14:01:24 -05:00
Marshall Bowers
a40f04b71f Only scroll enough to reveal the next channel if it isn't visible 
Co-authored-by: Max <max@zed.dev>
 2023-12-15 13:50:51 -05:00
Marshall Bowers
47fc03ab98 Fix positioning of the inline context menu 
Added a new `bounds_for_item` for `ListState`.

Co-authored-by: Max <max@zed.dev>
 2023-12-15 13:24:30 -05:00
Marshall Bowers
b478a4c4d5 Perform scroll interactions through the ListState 2023-12-15 12:10:40 -05:00
Marshall Bowers
6c10ff8548 Render the collab panel using a gpui::list 2023-12-15 11:56:03 -05:00
Mikayla
6973b1b592
Add several red outlines 2023-12-14 17:48:49 -08:00
Mikayla
8791f7cefc Enable dragging from project panel to panes 
Rework gpui2 drag API so that receivers need not specify the dragged view type.

co-authored-by: Max <max@zed.dev>
co-authored-by: Conrad <conrad@zed.dev>
 2023-12-14 13:20:48 -08:00
Mikayla
d88fc27b79
Merge branch 'main' into fix-splits-bugs 2023-12-13 18:29:48 -08:00
Marshall Bowers
057b235c56
Implement VisibleOnHover for IconButton (#3642) 
This PR implements the `VisibleOnHover` trait for `IconButton`s.

I noticed that in a lot of places we were wrapping an `IconButton` in an
extra `div` just so we could call `visible_on_hover` on it. By
implementing the trait on `IconButton` directly it allows us to avoid
the interstitial `div` entirely.

Release Notes:

- N/A
 2023-12-13 20:42:27 -05:00
Marshall Bowers
137e4e9251
Add .visible_on_hover helper method (#3639) 
This PR adds a `.visible_on_hover` helper method that can be used to
make an element only visible on hover.

I noticed we were repeating this similar stanza in a bunch of different
spots:

```rs
some_element
    .invisible()
    .group_hover("", |style| style.visible())
``` 

so it seemed like a nice thing to factor out into a reusable utility.

Release Notes:

- N/A
 2023-12-13 19:12:20 -05:00
Marshall Bowers
d59de96921
Style collab panel (#3638) 
This PR styles the collab panel.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-13 18:20:04 -05:00
Mikayla
bfbbec0b01
Add fluent quad API 2023-12-13 13:21:48 -08:00
Marshall Bowers
ee509e043d
Rework ListItem and ListHeader to use slot-based APIs (#3635) 
This PR reworks the `ListItem` and `ListHeader` components to use
slot-based APIs, making them less opinionated about their contents.

Splitting this out of the collab UI styling PR so we can land it to
avoid conflicts.

Co-authored-by: Nate <nate@zed.dev>

Release Notes:

- N/A
 2023-12-13 16:08:31 -05:00
Julia
2e00da5a79
zed2 notification panel (#3603) 
Release Notes:

- N/A
 2023-12-12 18:04:47 -05:00
Julia
fd6320b136 Finish fixing up Avatar using URI 2023-12-12 11:49:04 -05:00
Julia
44d40625fe Start changing Avatar to use URI 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-12-12 11:27:40 -05:00
Antonio Scandurra
b503edf24f Avoid cloning entries in CollabPanel::render_signed_in 2023-12-12 09:42:35 +01:00
Max Brunsfeld
cbce49ff68 Start work on dragging entries in the project panel 2023-12-11 15:52:58 -08:00
Joseph T. Lyons
9a36402fbe Use copy button for copy channel link 2023-12-11 13:14:29 -05:00
Conrad Irwin
9ce7395b74 Restore impl_actions! and remove derive(Action) 2023-12-10 19:33:38 -07:00
Conrad Irwin
4290c67b6a Restore namespace parameter to actions! 
This does not yet fix `derive(Action)`, but will conflict with a lot so
wanted to merge quickly.
 2023-12-09 15:18:31 -07:00
Max Brunsfeld
c7d8169cab Get the chat panel wired up again 2023-12-08 12:31:07 -08:00
Nathan Sobo
213ed2028c Get more of chat panel compiling, but lots of todos 2023-12-08 12:31:07 -08:00
Max Brunsfeld
1ec81e02da Allow opening channel notes from the channel list 2023-12-06 12:09:29 -08:00
Max Brunsfeld
bcdefb8ec8 Bring back channel notes 2023-12-06 12:09:27 -08:00
Antonio Scandurra
9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Max Brunsfeld
7b4b068230 Render chat and notes buttons below the current channel 2023-12-05 10:40:51 -08:00
Max Brunsfeld
38d41acf9b Fix rendering of shared screens in collab panel 2023-12-05 10:29:19 -08:00
Max Brunsfeld
5e79807f6f Fix tree branch rendering in collab panel 2023-12-05 10:14:40 -08:00
Antonio Scandurra
ede86d9187 WIP 2023-12-05 16:49:36 +01:00
Max Brunsfeld
ae6ddceb67
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 Brunsfeld
eff3a72fb5 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Max Brunsfeld
959b2961ff Revert "Decouple workspace from call (#3380)" 
This reverts commit 6da57cbc6e, reversing
changes made to 62b1843704.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00
Max Brunsfeld
2c5603032d Allow sharing projects 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Max Brunsfeld
63667ecf6f 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
859f2d2862 Get ChannelModal opening 2023-12-02 00:57:41 -07:00
Marshall Bowers
e5a5b1e84c
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
Conrad Irwin
4fbbb28da2 Restore logical offset preservation behaviour 2023-11-29 23:51:31 -07:00
Conrad Irwin
54cfcef0aa Keybaord shortcut context menu 2023-11-29 23:04:33 -07:00
Conrad Irwin
a37f86f294 Scroll the collab panel when keyboard focusing 2023-11-29 22:39:15 -07:00
Conrad Irwin
8638fc4149 Add a ScrollHandle to gpui2 for the collab panel 2023-11-29 22:20:06 -07:00
Conrad Irwin
012543052b Add filtering support 2023-11-29 20:58:15 -07:00
Conrad Irwin
4c27f4453c Merge branch 'main' into collab-panel2 2023-11-29 16:32:25 -07:00