oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,959 Commits 1 Branch 0 Tags
cef9aa359079f74dd8ae44accf3e6a162a76b162
Commit Graph
12182 Commits
Author SHA1 Message Date
Antonio ScandurraMax BrunsfeldNathan Sobo
 		cef9aa3590 Use a different frame arena for each window 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-12-18 18:58:40 +01:00
Nate Butler 5c7de103a9 Style wrap guides (#3693) 
[[PR Description]]

This PR styles wrap guides. Wrap guides weren't being added to the theme
in the theme importer, and they were also missing from One Dark.

One Dark:

![CleanShot 2023-12-18 at 11 16
48@2x](https://github.com/zed-industries/zed/assets/1714999/5578127f-8d69-4f47-af60-c44de87331e0)

Gruvbox:

![CleanShot 2023-12-18 at 11 17
38@2x](https://github.com/zed-industries/zed/assets/1714999/a2ac5db9-e5bf-4452-9f9d-49f074231587)

Bad border (known importer issue):

![CleanShot 2023-12-18 at 11 17
49@2x](https://github.com/zed-industries/zed/assets/1714999/37d11e37-38b6-4001-aef0-19fc2d925425)

No border (known importer issue):

![CleanShot 2023-12-18 at 11 18
14@2x](https://github.com/zed-industries/zed/assets/1714999/3d74bd8c-514e-4e14-94db-425a39d057ab)


Release Notes:

- N/A
 2023-12-18 11:35:00 -05:00
Julia 4707248714 Revert accidental merge of old version of workspace2 render function (#3694) 
Something happened with my local diff and
https://github.com/zed-industries/zed/pull/3691 somehow contained an old
version of workspace2's render function. Perhaps I rebased at some point
and borked it? Not sure 🤷‍♀️

Release Notes:

- N/A
 2023-12-18 11:32:06 -05:00
Joseph T. Lyons a623929340 Add backtrace hash to collab server panic api (#3692) 
Release Notes:

- N/A
 2023-12-18 11:21:41 -05:00
Nate Butler da7628cc1e Style wrap guides for imported themes 2023-12-18 11:16:22 -05:00
Nate Butler b46f5be490 Style One Dark wrap guides 2023-12-18 11:16:00 -05:00
Joseph T. Lyons 7cd6825eee Add backtrace hash to collab server panic api 2023-12-18 11:12:23 -05:00
Joseph T. Lyons 02bcc7bbeb Add release channel to zed2 collab server 2023-12-18 11:09:54 -05:00
Julia 488073deba Unbork project search focus (#3691) 
I got a little too clever for my own good with these focus handles
originally lol

Release Notes:

- N/A
 2023-12-18 10:54:11 -05:00
Julia b4042feccd Unbork project search focus 2023-12-18 10:44:34 -05:00
Kirill Bulatov 7e21e0f0eb Do not panic on non-worktree file indexing 2023-12-18 13:10:26 +02:00
Antonio Scandurra 4e544545d1 Introduce an Arena to allocate and deallocate frame-related structs more cheaply (#3689) 
Picture worth a thousand words:


![before-after](https://github.com/zed-industries/zed/assets/482957/0aa92baf-f1cd-485e-a234-6d8f8b63a79a)

Note how having an area makes a substantial amount of frames between
0.5ms and 1ms faster (15-20% faster frames).

Release Notes:

- N/A
 2023-12-18 11:16:07 +01:00
Antonio Scandurra 5a4e2e6b90 Use a closure to allocate structs onto the Arena 
This is a trick borrowed from Bumpalo that helps LLVM understand
it should instantiate the object directly on the heap, as opposed to
doing so on the stack and then moving it.
 2023-12-18 10:56:37 +01: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
Max Brunsfeld a4cdf365be Fix accidental drop of following task. Add back FollowNextCollaborator 2023-12-15 16:15:31 -08:00
Marshall Bowers 54eb452144 Only apply scroll correction in uniform_list when already scrolled (#3687) 
This PR fixes an issue where the scroll correction added to the uniform
list in a35fdf45fc was being applied even
if the list wasn't scrolled at all.

This manifested in the project panel starting with an incorrect scroll
offset that would disappear once scrolled.

It seems like we should only need to apply this scroll correction when
the list is already scrolled.

Release Notes:

- N/A
 2023-12-15 17:53:10 -05: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
Max Brunsfeld 149a718d65 Don't scroll List on scroll wheel events outside of its bounds 2023-12-15 13:38:49 -08:00
Max Brunsfeld a5e037befa Avoid duplicate render of a pane when it is zoomed 2023-12-15 13:26:48 -08:00
Max Brunsfeld e3e988c150 Always render panes via pane_group::Member::render 
Remove distinct code path for rendering panes in a PaneAxis, as this dropped
the logic for rendering the leader border and info box.
 2023-12-15 13:26:36 -08:00
Max Brunsfeld 4eb609a954 Enable zoom (#3668) 
* [x] zoom
* [x] pane tests
 2023-12-15 12:58:03 -08:00
Nate Butler 7af0edf5b6 Editor UI Cleanup (#3676) 
[[PR Description]]

TODO: 
- [x] Style fold marker
- [x] Editor - Code action icon too large, should use muted color,
should have tooltip
- [ ] Style inline assistant
    - Prompt text gets cut off veritcally
- [x] Line height on inline assist editor isn't tall enough
- Nate: This is my fault due to the line height (relative: 1) we are
setting on non-buffer editors. I'll look into this.
- [ ] Style diagnostic hover (right now it's an opaque box on some
themes)
    - Nate: This needs status tints, we are working on it
- [ ] Hovering over a symbol shows a dialogue that appears underneath
the scroll-bar

Release Notes:

- N/A
 2023-12-15 15:49:55 -05:00
Nate Butler e71f2b49e8 Style fold control 2023-12-15 15:41:53 -05:00
Conrad Irwin b8cdcf4e93 fix theme selector gaps (#3682) 
- Don't scroll beyond end of uniform list
- Restore position of uniform_list padding

[[PR Description]]

Release Notes:

- N/A
 2023-12-15 13:27:17 -07:00
Nathan Sobo 3781626379 Merge branch 'main' into arena 2023-12-15 13:22:19 -07:00
Conrad Irwin 3c3e5ed7d8 Fix bug where vim commands were copied on each update_matches (#3680) 
In zed1, the array of commands was recalculated on every update_matches,
In zed2 it's cached before we change the focus.

Release Notes:

- N/A
 2023-12-15 13:20:10 -07:00
Conrad Irwin 2fe9a1df21 Restore position of uniform_list padding 
It should be inside the scrollable area.
 2023-12-15 13:18:51 -07:00
Max Brunsfeld 4c3ec0a8e5 Enable pane tests 2023-12-15 12:00:58 -08:00
Conrad Irwin a35fdf45fc Don't scroll beyond end of uniform list 2023-12-15 12:54:12 -07:00
Max Brunsfeld 9a8225c855 When a dock is zoomed, don't render it in its normal place 2023-12-15 11:48:25 -08:00
Max Brunsfeld a4c123bb11 Fix logic for activating panel when re-docking it 2023-12-15 11:47:01 -08:00
Marshall Bowers b1a61ca21e Fix toolbar width (#3681) 
This PR fixes an issue with the toolbar width introduced in #3666.

The lack of a flex container was making the toolbar contents not take up
the full width, and thus not positions items correctly along its main
axis.

Release Notes:

- N/A
 2023-12-15 14:44:29 -05:00
Max Brunsfeld 793381f455 Render zoomed item in the workspace 2023-12-15 11:19:59 -08: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
Mikayla Maki dc7f4f4786 Fix editor mouse event dispatch stealing clicks (#3679) 
[[PR Description]]

Release Notes:

-
 2023-12-15 11:06:31 -08:00
Marshall Bowers 5c060ceb1c Format code 2023-12-15 14:03:49 -05:00
Marshall BowersandMax 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
Conrad Irwin d0dbf8e1e2 Fix bug where vim commands were copied on each update_matches 
In zed1, the array of commands was recalculated on every update_matches,
In zed2 it's cached before we change the focus.
 2023-12-15 11:59:06 -07:00
Marshall BowersandMax 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
Mikayla b4135dd2f1 Fix editor mouse event dispatch 2023-12-15 10:26:41 -08:00
Marshall BowersandMax 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
Mikayla a2852e36ce Fix pane resizing 2023-12-15 10:07:10 -08:00
Antonio Scandurra 0a57171066 Use a safe API for Arena 2023-12-15 19:03:37 +01:00
Nate Butler 4cb0f60779 Update size of code action indicator and show when active 2023-12-15 12:29:33 -05:00
Nate Butler 83525bf142 Revert change to single line editor height 2023-12-15 12:22:33 -05:00
Marshall Bowers b478a4c4d5 Perform scroll interactions through the ListState 2023-12-15 12:10:40 -05:00
Nate Butler d13c1486da Update fold_indicator render 2023-12-15 12:09:06 -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