Commit Graph
15072 Commits
Author SHA1 Message Date
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
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
Nate Butler fe80b7a347 WIP 2023-11-30 00:28:05 -05: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
Marshall Bowers bf04532715 Reorganize list components 2023-11-29 13:34:50 -05:00
Conrad Irwin 483a6ddf6c Progress 2023-11-29 11:06:24 -07:00
Max Brunsfeld e43284ae8a Add a context menu to the project panel (#3393)
This PR adds a context menu to the project panel in Zed2.

* [x] Allow the context menu to extend outside of the project panel's
bounds
* [x] Add keyboard shortcuts to the context menu
* [x] Dismiss the context menu
    * [x] when running an action
    * [x] when changing selection in the project panel

Release Notes:

NA
2023-11-29 10:04:41 -08:00
Marshall Bowers a449e90498 Add Disableable trait (#3439)
This PR adds a new `Disableable` trait to use for elements that are
capable of being disabled.

Release Notes:

- N/A
2023-11-29 13:01:26 -05:00
Max Brunsfeld 0d3b09ea8d Merge branch 'main' into project-panel-context-menu 2023-11-29 09:45:31 -08:00
Conrad Irwin 312ad76d97 Move padding on uniform list inside the scrollable area (#3437)
Release Notes:

- N/A
2023-11-29 10:43:04 -07:00
Max BrunsfeldandConrad d018e9c0db Make DismissEvent a unit struct
Co-authored-by: Conrad <conrad@zed.dev>
2023-11-29 09:42:54 -08:00