Commit Graph
31406 Commits
Author SHA1 Message Date
Max Brunsfeld 8990ccbc48 Show action key bindings in context menus 2023-11-28 16:07:42 -08:00
Conrad Irwin 1439a10965 Channel joining (#3428)
- Remove debugging
- Basic channel joining!

[[PR Description]]

Release Notes:

- N/A
2023-11-28 17:00:21 -07:00
Conrad Irwin 3949976c78 Togglable channels, the greatest since sliced bread 2023-11-28 16:52:12 -07:00
Mikayla d6a5f8a3aa Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla 330de46cf4 Restore welcome page and several pickers 2023-11-28 15:25:28 -08:00
Conrad Irwin 3d4ac1ffbf Fix tests, notify errors 2023-11-28 16:20:54 -07:00
Mikayla 4f97c7c98c Implement all but the UI 2023-11-28 15:18:19 -08:00
Max Brunsfeld 053f3b646a Add a basic context menu to the project panel 2023-11-28 15:12:46 -08:00
Conrad Irwin 49c75817ea Basic channel joining! 2023-11-28 16:10:18 -07:00
Conrad Irwin 0e2bb68b2c Fix mouse events when element is occluded (#3417)
This commit adds a depth map to the frame so we can find the "top most"
opaque layer by stacking order for a given point.

This lets us determine whether the element being hovered was part of the
given layer in the previous frame, which fixes the hover issue.

Still to do:
* [ ] Fix up mouse events too (I tried this, but it's not working yet,
and I want to understand why)

Release Notes:

- N/A
2023-11-28 15:57:22 -07:00
Conrad Irwin d948375d10 Remove debugging 2023-11-28 15:33:44 -07:00
Marshall Bowers ab89e5c686 Merge branch 'main' into collab-panel2 2023-11-28 17:07:40 -05:00
Marshall Bowers 644a341bc5 Fix tooltips not showing on IconButtons (#3427)
This PR fixes tooltips not showing on `IconButton`s.

The "fix" here is the same hack that we used to fix `on_click` handlers
for `ListItem`s, where we introduce another layer of wrapping with an
element with an ID set.

This PR also adds a story for the `IconButton` so this issue can be
tested/observed in isolation.

Release Notes:

- N/A
2023-11-28 17:01:53 -05:00
Conrad Irwin 13e847107d More progress on collab panel 2023-11-28 14:40:32 -07:00
Marshall Bowers 5871b0a75c storybook2: Unsuppress and fix warnings (#3425)
This PR unsupresses the warnings in `storybook2` and summarily fixes
them.

Release Notes:

- N/A
2023-11-28 15:43:43 -05:00
Marshall Bowers 1c9eb27757 ui2: Reference theme2 and settings2 crates without the 2 (#3424)
This PR updates the `ui2` crate to reference the `theme2` and
`settings2` crates without the `2` the way we do in our other crates.

Release Notes:

- N/A
2023-11-28 15:30:29 -05:00
Nate Butler db67d14e46 Unused imports 2023-11-28 15:17:09 -05:00
Nate Butler 2b8514d5fc Fix missing arrows 2023-11-28 15:15:49 -05:00
Nate Butler 6399784932 Update keybinding.rs 2023-11-28 15:12:40 -05:00
Nate Butler f0d5f155e1 Merge branch 'main' into refine-keybindings 2023-11-28 15:12:22 -05:00
Nate Butler 161cb70aca Update command_palette.rs 2023-11-28 15:06:37 -05:00
Marshall Bowers da5cfb3f5a ui2: Unsuppress and fix warnings (#3423)
This PR unsupresses the warnings in `ui2` and summarily fixes them.

Release Notes:

- N/A
2023-11-28 14:44:19 -05:00
Nate Butler 858a30fbeb Update keybinding.rs 2023-11-28 14:40:26 -05:00
Marshall Bowers b8bd5826c2 Add inset variant to ListItem (#3422)
This PR adds an inset variant to the `ListItem` component.

We're now using this inset variant for the `ListItem`s we render in
pickers.

Release Notes:

- N/A
2023-11-28 14:27:19 -05:00
Nate Butler f28e252e50 Merge branch 'main' into refine-keybindings 2023-11-28 14:00:09 -05:00
Conrad Irwin 77cf299566 Merge branch 'main' into collab-panel2 2023-11-28 11:40:58 -07:00
Marshall Bowers 3483114c19 Use ListItems in the project panel (#3421)
This PR reworks the project panel to render its items using the
`ListItem` component.

There are a few hacks in here in order to get click handlers working for
the `ListItem`, but we'll want to get these fixed in GPUI.

Release Notes:

- N/A
2023-11-28 13:11:43 -05:00
Conrad Irwin 5b5206ab64 More mouse occlusion work 2023-11-28 09:59:58 -07:00
Kirill Bulatov 08dc019824 Use proper npm arguments and clean its inherited env vars 2023-11-28 18:39:03 +02:00
Antonio Scandurra aff62ff89e WIP: preserve aspect ratio of images 2023-11-28 17:33:11 +01:00
Marshall Bowers a6370091bc Use ListItems in Picker story 2023-11-28 10:52:17 -05:00
Antonio ScandurraandJulia fd4a8afc92 Introduce surface rendering
Co-Authored-By: Julia <julia@zed.dev>
2023-11-28 16:47:31 +01:00
Marshall Bowers 6ee92d1366 Use ListItem when rendering picker matches 2023-11-28 10:44:57 -05:00
Marshall Bowers c9a97782c9 Allow render_match to return an Option to represent no matches 2023-11-28 10:33:13 -05:00
Piotr Osiewicz 3033826942 fixup! Add contact finder, change ui::List's on_click handler signature 2023-11-28 14:37:53 +01:00
Piotr Osiewicz e81e3c4fb3 Add contact finder, change ui::List's on_click handler signature 2023-11-28 14:16:51 +01:00
Conrad Irwin d1cdd512bd Use layers to correct mouse event handling too 2023-11-28 00:07:26 -07:00
Conrad Irwin 8a908df52c Fix hover state when element is occluded 2023-11-27 23:18:25 -07:00
Conrad Irwin 7260a5ef7e Show channels and users in the sidebar 2023-11-27 19:57:55 -07:00
Mikayla Maki 39f40ce22c Add Uiua language and Nu LSP (#3416)
Adds support for Uiua to my favorite editor in advance of AOC and
integrates the new nushell lsp. Change made to both zed1 and zed2.

Release Notes:

- Added support for the integrated Nushell LSP
- Added support for the Uiua language
2023-11-27 18:55:51 -08:00
Mikayla a614cc433c Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Mikayla 8436b634b3 Add uiua and nu languages 2023-11-27 18:46:56 -08:00
Nate Butler 52900b4088 🚧 Completion & Popover Styles 🚧 (#3406)
TODO:

- [ ] Add y axis padding to list instead of popover container
- [x] Combined max-width between completions list and docs
- [ ] Allow docs to be taller than completion list
- [x] Use the workspace bounds to set doc position
- [ ] Clean up markdown styles
- [x] (🐜) Changing items should set doc scroll position to the top
- [x] (🐜) popovers should render on top of all panes
- [ ] (extra) Try adding code block backgrounds to md rendering
- [ ] (extra) Use ui font for markdown text, buffer font for markdown
code.
- [ ] (extra) Try lining up inline code in completions menu

[[PR Description]]

Release Notes:

- N/A
2023-11-27 21:08:21 -05:00
Conrad Irwin f31e301c73 Scaffolding for update notification too (#3410)
Release Notes:

- N/A
2023-11-27 19:05:15 -07:00
Nate Butler 7c497bd783 Update popover.rs 2023-11-27 20:12:20 -05:00
Nate Butler 88aefa344a Merge branch 'main' into completions-styles 2023-11-27 19:22:07 -05:00
Conrad Irwin 4c8c526d85 remove zed1 notification mess (#3415)
Accidentally added while testing zed2

Release Notes:

- N/A
2023-11-27 16:52:51 -07:00
Conrad Irwin f41174a63b remove zed1 notification mess 2023-11-27 16:27:02 -07:00
Conrad Irwin 853b68b456 TEMP 2023-11-27 16:22:01 -07:00
Max Brunsfeld 76e7223108 Upgrade Tree-sitter for stack-overflow bugfix (#3413)
Fixes https://github.com/zed-industries/community/issues/2290

This PR bumps Tree-sitter for
https://github.com/tree-sitter/tree-sitter/pull/2788.

Release Notes:

- Fixed a crash that could happen when opening certain large markdown
files.
2023-11-27 15:13:55 -08:00