yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,082 Commits 5 Branches 0 Tags
df8dcd42dc616d76c4f45b3306aec75ffb9ab405
Commit Graph
15082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra df8dcd42dc WIP 2023-11-30 18:00:41 +01:00
Antonio ScandurraandNathan Sobo 28698b6e48 Pass a WindowContext in request_measured_layout 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-30 17:12:40 +01:00
Antonio Scandurra 612200aa3d Lift Send and Sync restriction for measurements 2023-11-30 16:37:57 +01:00
Antonio Scandurra 45b33ec6d4 Re-introduce screen-sharing in zed2 (#3456) 
Release Notes:

- N/A
 2023-11-30 12:14:11 +01:00
Antonio Scandurra 418a3e13d1 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Antonio Scandurra 50dc4b4e68 Fix error in tests 2023-11-30 11:45:10 +01:00
Antonio Scandurra c948f8f221 Polish screen sharing 2023-11-30 11:22:01 +01: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 4c694ad474 Collab panel2: Now with scrolling and keyboard (#3455) 
Also introducing: .track_scroll() for non-uniform lists.

Release Notes:

- N/A
 2023-11-30 00:13:52 -07:00
Conrad Irwin a359832abb Allow toggling subchannel visiblity without joining channel 2023-11-29 23:55:14 -07: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
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
Max Brunsfeld 0bb18f3514 Implement activity indicator in zed2 (#3453) 
No more hard-coded "Checking..."
 2023-11-29 17:25:12 -08:00
Max Brunsfeld 189fe50f89 Implement activity indicator in zed2 2023-11-29 17:18:21 -08:00
Max Brunsfeld a694715cc8 Address some TODOs in editor2 crate (#3445) 
* Fix crash when jumping to definition
* Enabling resolution of completions
* Make links in interactive text clickable
* Enable code paths that use `select_anchors`
 2023-11-29 16:32:02 -08:00
Marshall Bowers 3aad7fc41b Use ButtonLike for breadcrumb (#3452) 
This PR updates the (placeholder) breadcrumb to use the new `ButtonLike`
component.

Eventually this will need custom styling (e.g., syntax highlighting for
the symbol children), which is why we're using a `ButtonLike` as opposed
to a regular `Button`.

Release Notes:

- N/A
 2023-11-29 19:21:34 -05:00
Marshall Bowers 7f4c0fc6a4 Implement Selectable for buttons (#3451) 
This PR implements the `Selectable` trait for `ButtonLike`, `Button`,
and `IconButton`.

Release Notes:

- N/A
 2023-11-29 18:46:41 -05:00
Conrad Irwin bcadeff514 collab panel2 (#3447) 
[[PR Description]]

Release Notes:

- N/A
 2023-11-29 16:38:35 -07:00
Max Brunsfeld f2d30de867 Fix crash when jumping to a definition in the same buffer 2023-11-29 15:36:22 -08:00
Conrad Irwin a3da146926 Merge branch 'main' into collab-panel2 2023-11-29 16:32:25 -07:00
Marshall Bowers 6db2d19250 Fix the selected state for the panel icons in the status bar (#3450) 
This PR fixes a bug where the selected state for the panel icons in the
status bar was not correctly reflecting whether the panel was open.

It was erroneously using the `is_open` state for the context menu.

Release Notes:

- N/A
 2023-11-29 18:20:08 -05: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
Max Brunsfeld dd4b7d564f Implement highlighting of go-to-definition links 2023-11-29 14:30:31 -08:00
Conrad Irwin b905ce7ccf Fix mouse interaction on contact subsections 2023-11-29 15:26:19 -07:00
Max Brunsfeld c97c407d1c Implement completion-resolution in editor2 
Enable the completion tests in editor2.
 2023-11-29 14:20:47 -08:00
Conrad Irwin 573b51326c Availability indicators 2023-11-29 15:06:58 -07:00
Conrad Irwin 8426dc6da1 Make LeftSlot take an element 2023-11-29 14:20:26 -07:00
Marshall Bowers 22e7659624 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
Max Brunsfeld 13201a5c0f Use pointer cursor style for clickable ranges in InteractiveText 2023-11-29 12:42:09 -08:00
Max Brunsfeld 41d3616720 Implement SelectionsCollection::select_anchor_ranges 2023-11-29 12:41:22 -08:00
Conrad Irwin 416f7f91b0 Context menu, Dragon Drop, for collab panel (#3441) 
Release Notes:

- N/A
 2023-11-29 13:40:46 -07:00
Marshall Bowers 31f70353a7 Move GraphicSlot out of components module (#3444) 
This PR moves the `GraphicSlot` definition out of the `components`
module, as it doesn't contain a component.

Release Notes:

- N/A
 2023-11-29 15:29:33 -05:00
Conrad Irwin 4df2a078a7 No moar toggleable 2023-11-29 13:25:29 -07:00
Conrad Irwin b2f708cf0e Merge branch 'main' into collab-panel2 2023-11-29 13:09:57 -07:00
Nate Butler 7657769f27 Style hover popover (#3443) 
[[PR Description]]

This PR styles the hover popover, and sets it on the [second elevation
level](https://zed-docs.vercel.app/doc/ui2/trait.StyledExt.html#method.elevation_2).

![CleanShot 2023-11-29 at 14 55
55@2x](https://github.com/zed-industries/zed/assets/1714999/01589b2a-d6e2-4baa-ba5d-050f06cf2c58)


Release Notes:

- N/A
 2023-11-29 15:07:46 -05:00
Nate Butler ecf4228443 Style hover popover 2023-11-29 14:56:23 -05:00
Marshall Bowers 8f70f5bce3 Rework Disclosure component (#3442) 
This PR reworks the `Disclosure` component.

The primary goal here was to remove the illegal state where a
`Disclosure` is rendered with a `Toggle::NotToggleable` state, as the
`Disclosure` shouldn't exist at all in this case.

Release Notes:

- N/A
 2023-11-29 14:46:39 -05:00
Conrad Irwin a34b2fda82 Merge branch 'main' into collab-panel2 2023-11-29 12:37:29 -07:00
Conrad IrwinandMax 7883cd71a4 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Marshall Bowers 48493d1f6a Rework Toggle into Toggleable and ToggleState 2023-11-29 14:33:52 -05:00
Conrad IrwinandMax e24a731139 Add channel drag'n'drop 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:24:04 -07:00
Marshall Bowers 9438636415 Rework Disclosure component 2023-11-29 14:07:48 -05:00
Marshall Bowers 895647a0cc Reorganize list components (#3440) 
This PR reorganizes the list components so that each of the sub
components lives in its own file.

### Motivation

I've seen a number of folks have trouble finding the `ListItem`
definition while pairing, so having it in its own file seems more
self-explanatory.

Release Notes:

- N/A
 2023-11-29 13:45:59 -05:00
Conrad Irwin 82425a1036 Channel Context Menu 2023-11-29 11:39:26 -07:00
Marshall Bowers 51e94393ea Remove unnecessary constructor and Clone derives 2023-11-29 13:38:05 -05:00