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

180 commits

Author SHA1 Message Date
Max Brunsfeld
a4bfd0147d Render channel invites in collab panel, fix unused warnings 2023-12-19 10:20:40 -08:00
Marshall Bowers
a3bab25792
Style contact finder (#3717) 
This PR styles the contact finder.

<img width="598" alt="Screenshot 2023-12-19 at 12 59 00 PM"
src="https://github.com/zed-industries/zed/assets/1486634/ca9d9345-bf27-4256-aabc-6017a0c4d217">

Release Notes:

- N/A
 2023-12-19 13:16:14 -05:00
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
91f1be213b
Style project share notification (#3706) 
This PR styles the project share notification, so we're not staring a
red rectangle.

<img width="425" alt="Screenshot 2023-12-18 at 6 06 14 PM"
src="https://github.com/zed-industries/zed/assets/1486634/7ae9a2d3-d5d9-427c-9125-3a47df5f6a2f">

Release Notes:

- N/A
 2023-12-18 18:13:09 -05: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
Max Brunsfeld
29c6061a14
Fix following bugs (#3688) 
* Follow command didn't work, because follow task was dropped
* An extra div prevented titlebar facepiles from rendering correctly
 2023-12-15 16:34:08 -08:00
Max Brunsfeld
b5ae2f060b Remove div around all avatars in titlebar facepile 2023-12-15 16:26:56 -08: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
487edcb12b
Rework collab panel rendering to use gpui::list (#3678) 
This PR reworks the rendering of the collab panel to use `gpui::list`,
so that we don't render any items that are not visible on the screen.

In the process we also fixed some bugs in the channel list:

- Fixed the context menu for channels not deploying when activated via
keyboard
- Fixed drag and drop for channels
- Made it so when navigating the collab panel via keyboard the list only
scrolls enough to reveal the next item when navigating to an item that
is currently off-screen

Release Notes:

- N/A
 2023-12-15 14:11:24 -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
Nate Butler
6345e6d4d2 Add some right side padding in titlebar. 2023-12-15 11:25:24 -05:00
Nate Butler
47eaf1abd8 Remove red borders, improve left side padding 2023-12-15 11:07:40 -05:00
Conrad Irwin
7e1d61d116 Merge branch 'main' into user-menu 2023-12-14 20:18:20 -07:00
Mikayla Maki
46bd6088e8
Fix some todos, add others (#3669) 
As it says on the tin

Release Notes:

-
 2023-12-14 19:00:58 -08:00
Mikayla
6973b1b592
Add several red outlines 2023-12-14 17:48:49 -08:00
Nathan Sobo
02606d1fb9 Merge remote-tracking branch 'origin/main' into perf-2 2023-12-14 16:56:36 -07: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
Nathan Sobo
fb3382bcc5 Merge remote-tracking branch 'origin/main' into perf-2 2023-12-14 14:16:59 -07:00
Nathan Sobo
1ae25f52a1 WIP 2023-12-14 10:31:45 -07:00
Piotr Osiewicz
9bce30687e
Vcs menu2 (#3648) 
Header and footer are gonna be added in a separate PR as they require
changes to Picker trait that I feel are separate from the contents of
this PR.

Release Notes:

- N/A
 2023-12-14 12:36:53 +01: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
Conrad Irwin
7899833367 Don't hang the app when signing in offline 2023-12-13 15:52:43 -07:00
Mikayla
bfbbec0b01
Add fluent quad API 2023-12-13 13:21:48 -08:00
Conrad Irwin
3094cb749e Implement user menu 2023-12-13 14:14:03 -07: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
Piotr Osiewicz
72eef116c9 fixup! collab_ui: Wire up project picker 2023-12-13 12:53:41 -08:00
Piotr Osiewicz
a91a42763f collab_ui: Wire up project picker 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-12-13 12:53:41 -08:00
Piotr Osiewicz
6147530156 fixup! collab_ui: Wire up project picker 2023-12-13 17:58:17 +01:00
Piotr Osiewicz
a71365a1d3 collab_ui: Wire up project picker 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-12-13 17:56:49 +01:00
Max Brunsfeld
e09b07ddae
Allow dragging tabs (#3616) 2023-12-12 16:20:37 -08:00
Max Brunsfeld
a579713a45 Allow dragging and dropping tabs 
Co-authored-by: Nathan <nathan@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
 2023-12-12 15:07:03 -08:00
Julia
2e00da5a79
zed2 notification panel (#3603) 
Release Notes:

- N/A
 2023-12-12 18:04:47 -05:00
Julia
29413bc72c Fix defer handle double lease 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-12-12 17:47:12 -05:00
Julia
51ceb52931 Fix borked layout 2023-12-12 17:22:49 -05:00
Julia
01d4e711d8 Get notifications rendering in panel 2023-12-12 16:31:26 -05:00
Julia
d3eff6371e Panel showing up 2023-12-12 16:14:43 -05:00
Julia
52e72d9648 Builds and runs 2023-12-12 13:07:17 -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