mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-17 07:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
15473 commits 507 branches 811 tags 213 MiB
Commit graph

103 commits

Author SHA1 Message Date
Nate Butler
fffe4f51fb Update pickers to have a consistently larger size 2023-12-06 23:38:47 -05:00
Marshall Bowers
a4b271e063
Port recent_projects to Zed2 (#3525) 
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
 2023-12-06 18:41:50 -05:00
Max Brunsfeld
e9dcca7712 Initialize channel notes to register the view as followable 2023-12-06 12:09:29 -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
Nate Butler
ab75dbe7af Update collab_titlebar_item.rs 2023-12-01 10:52:11 -05:00
Nate Butler
88188b0c30 Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00
Conrad Irwin
e1c8369b3d 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
ebbbeca9a6 Flesh out a popover control 2023-11-30 16:13:44 -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
Nate Butler
164084c61c Update collab_titlebar_item.rs 2023-11-30 14:55:59 -05:00
Nate Butler
180ba42456 WIP update popover_menu 2023-11-30 14:54:44 -05:00
Nate Butler
5fdfdb046c Remove unused import 2023-11-30 13:13:22 -05:00
Nate Butler
5eb89781e3 Clean up left side titlebar buttons 2023-11-30 13:11:20 -05:00
Nate Butler
679851e349 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 Butler
8d4652a4db 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
0a8a84f656
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
e20309f560 Update collab_titlebar_item.rs 
[no ci]
 2023-11-30 09:44:33 -05:00
Nate Butler
daf6201deb Start plugging selected states into collab ui 2023-11-30 09:35:37 -05:00
Nate Butler
82b3efa16c Update collab button styles 2023-11-30 09:12:39 -05:00
Antonio Scandurra
cc0bc444b1 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
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
Nate Butler
92d2048aa4 WIP 2023-11-30 00:28:05 -05: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
Marshall Bowers
b357ae4dc3
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
cd60d466b1 Merge branch 'main' into collab-panel2 2023-11-29 15:40:16 -07:00
Conrad Irwin
0eef4d03ed Scrollyscrolly 2023-11-29 15:30:50 -07:00
Conrad Irwin
4f040208c6 Fix mouse interaction on contact subsections 2023-11-29 15:26:19 -07:00
Conrad Irwin
3bdd51cb2a Availability indicators 2023-11-29 15:06:58 -07:00
Marshall Bowers
df5de47a78
Make toggle method accept impl Into<Option<bool>> (#3446) 
This PR makes the `toggle` method on the various list components accept
an `impl Into<Option<bool>>` instead of just an `Option<bool>`.

This allows a caller with just a `bool` avoid having to wrap the
`Option` themselves.

Release Notes:

- N/A
 2023-11-29 16:13:41 -05:00
Conrad Irwin
6ab3825ab1 No moar toggleable 2023-11-29 13:25:29 -07:00
Conrad Irwin
87cf0cf5ac Merge branch 'main' into collab-panel2 2023-11-29 13:09:57 -07:00
Conrad Irwin
7e5aa5ce77 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Marshall Bowers
e77846d2dc Rework Toggle into Toggleable and ToggleState 2023-11-29 14:33:52 -05:00
Conrad Irwin
e377bd805b Add channel drag'n'drop 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:24:04 -07:00