oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,171 Commits 1 Branch 0 Tags
eff3a72fb568f8709eaa7a1e1d90706d4cba63ea
Commit Graph
15171 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max BrunsfeldandNathan eff3a72fb5 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Max BrunsfeldandNathan 71a1125e88 Allow joining remote projects in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:06:08 -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 BrunsfeldandNathan 2c5603032d Allow sharing projects 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Max BrunsfeldandNathan 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
Max Brunsfeld 26ae31b503 Bump RPC protocol version in zed2 to match zed1 (#3482) 2023-12-01 13:14:49 -08:00
Max Brunsfeld 6b0457c52f Bump RPC protocol version in zed2 to match zed1 2023-12-01 13:08:45 -08:00
Max Brunsfeld d788bf3f1e Fix retrieval of app version in auto_update2 (#3481) 
With this fix, auto-updates should work on nightly.
 2023-12-01 12:59:02 -08:00
Max Brunsfeld d85db44552 Fix retrieval of app version in auto_update2 2023-12-01 12:52:26 -08:00
Max Brunsfeld 5dd9db3607 collab 0.29.1 2023-12-01 11:50:05 -08:00
Max Brunsfeld aace0d816d Prevent moving a channel into its descendant (#3480) 
This fixes a bug where it was possible to put the channel tree into a
bad state by accidentally dragging a channel into itself or one of its
descendants.
 2023-12-01 11:47:39 -08:00
Max Brunsfeld 4479628342 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Marshall Bowers c3e7732eab Add support for optional icon to Button (#3479) 
This PR extends `Button` with support for an optional icon to be
displayed next to the label.

As part of this, the functionality for displaying an icon within a
button has been factored out into an internal `ButtonIcon` component.
`ButtonIcon` is now used by both `IconButton` and `Button` to
encapsulate the concerns of an icon that is rendered within a button.

Release Notes:

- N/A
 2023-12-01 14:30:38 -05:00
Marshall Bowers 4b23c5c658 Add selected_label to Button (#3478) 
This PR adds a new `selected_label` method to `Button`.

This can be used to set a different label that should be rendered when
the `Button` is selected.

Release Notes:

- N/A
 2023-12-01 13:29:11 -05:00
Marshall Bowers 4f507756d6 Add selected_icon to IconButton (#3477) 
This PR adds a new `selected_icon` method to `IconButton`.

This can be used to set a different icon that should be rendered when
the `IconButton` is selected.

Release Notes:

- N/A
 2023-12-01 13:17:32 -05:00
Marshall Bowers 12b58f5b60 Add selected_icon to IconButton 2023-12-01 13:10:53 -05:00
Marshall Bowers f09d9ef723 Clean up some ButtonLike doc comments 2023-12-01 13:09:35 -05:00
Julia be5eb3e3b5 Zed2 breadcrumbs & tab bar context menus & pane focus events (#3475) 
See title

Release Notes:

- N/A
 2023-12-01 12:53:15 -05:00
Julia 6f9e08ceea Merge branch 'main' into zed2-breadcrumbs 2023-12-01 12:28:36 -05:00
Nate Butler 85d72f63c1 Add Tinted button style placeholder and document ButtonLike (#3476) 
- Adds a placeholder `ButtonStyle::Tinted`.
  - Note: Using this now will just give you a block of `gpui::red()`
- Documents ButtonLike and ButtonStyle to hopefully help make choosing a
button style easier.

Release Notes:

- N/A
 2023-12-01 12:18:35 -05:00
Julia 910aeb4f56 I'm a dunce 2023-12-01 11:47:04 -05:00
Nate Butler 0d33f01fa4 Collab UI Refinement - Part 1 (#3460) 
[[PR Description]]

Still WIP, merging this to get menu changes in.

Release Notes:

- N/A
 2023-12-01 11:42:31 -05:00
Piotr Osiewicz a40a5fb212 Revert "editor tests: Reintroduce block_on_ticks." 
This reverts commit aed11ee8cb.
 2023-12-01 17:24:20 +01:00
Piotr OsiewiczandAntonio aed11ee8cb editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:22:12 +01:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05: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
Julia ce16e5b54a Unbreak toolbar layout & improve disabling ButtonLike 2023-12-01 10:33:44 -05:00
Antonio Scandurra 134f3eb79f Add mouse context menu to editor2 (#3473) 
We observed some weird behavior in `ContextMenu`, specifically:

- It seems like we don't intercept actions that have been dispatched,
which causes the context menu to stay open.
- The key bindings for editor actions in the context menu seem to come
from Vim

Release Notes:

- N/A
 2023-12-01 16:25:07 +01:00
Antonio ScandurraandPiotr 5fefc121bf Add mouse context menu to editor2 
Co-Authored-By: Piotr <piotr@zed.dev>
 2023-12-01 16:01:56 +01:00
Antonio Scandurra 9fedb4c7ee Get editor2 mostly to feature-parity with editor (#3472) 
The only missing piece is the context menu, which I'll work on next.

Release Notes:

- N/A
 2023-12-01 14:44:56 +01:00
Antonio Scandurra f0c205be5d Respond to modifiers changed event in editor2 and set cursor 2023-12-01 14:26:49 +01:00
Antonio Scandurra f0bc4a04bd Uncomment git gutter painting 2023-12-01 13:45:14 +01:00
Antonio Scandurra 1abc876c15 Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor 
# Conflicts:
#	crates/editor2/src/items.rs
 2023-12-01 12:40:48 +01:00
Antonio Scandurra 8e4f2fb25a Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Antonio Scandurra faa896343b Register NewFile and NewFileInDirection from Editor 2023-12-01 12:11:54 +01:00
Antonio Scandurra a8a5785ec5 Re-enable opening excerpts in Editor 2023-12-01 12:03:21 +01:00
Antonio Scandurra c9be637b6b Re-introduce auto-height in editor2 (#3471) 
Release Notes:

- N/A
 2023-12-01 12:02:45 +01:00
Antonio Scandurra 0b7e324d86 🔥 2023-12-01 11:53:47 +01:00
Antonio Scandurra 8c59a2d2c0 Delete commented out code for editor element 2023-12-01 11:52:40 +01:00
Antonio Scandurra 21d3ae603d Remove stray dbg statements 2023-12-01 11:49:25 +01:00
Antonio Scandurra 1b07fd6a70 Fix edits not being reported when rewrapping 2023-12-01 11:48:21 +01:00
Joseph T. Lyons eef6c3729e Fix bug preventing spaces from being used in filename (#3454) 
This bug was my fault, something I changed months ago to be more
consistent with VS Code - really strange that it took months for someone
to find out spaces couldn't be used in the project panel.

~I didn't apply this fix to zed2 because I dont think the facilities are
in place to do so (@maxbrunsfeld, @mikayla-maki, is there a system in
place for this that I missed?). I did leave a TODO.~

Fix is now in zed 2.

Release Notes:

- Fixed a bug where spaces could not be inserted when editing file names
in the project panel
([#2308](https://github.com/zed-industries/community/issues/2308)).
 2023-11-30 21:44:48 -05:00
Joseph T. Lyons 9849a0a6d8 Move project panel's dispatch_context() to render() 2023-11-30 21:37:41 -05:00
Marshall Bowers 6d62e6c562 Respect label_color for Buttons (#3469) 
This PR makes `Button`s respect the `label_color` that is specified,
provided they are not disabled or selected.

Release Notes:

- N/A
 2023-11-30 20:36:59 -05:00
Conrad Irwin 0441b4805a Show cursor position in status bar (#3464) 
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
 2023-11-30 16:40:42 -07: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
Max Brunsfeld 4f74d65d0c Restore some workspace functionality, enable workspace tests (#3468) 
* Pane history navigation
* Autosave on focus change
* Setting the window title based on the active path
 2023-11-30 15:26:44 -08:00
Conrad Irwin ebbbeca9a6 Flesh out a popover control 2023-11-30 16:13:44 -07:00
Max Brunsfeld cb11c1282c Re-introduce active path tracking in workspace 2023-11-30 14:58:14 -08:00