yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,182 Commits 5 Branches 0 Tags
2fce2d590d45a19bc30ba803dc9d3700a28c7e87
Commit Graph
15182 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate ButlerandMarshall Bowers 2fce2d590d Clean up ButtonLike 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:32:25 -05:00
Nate ButlerandMarshall Bowers 5f90f74a45 Remove debug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:32:14 -05:00
Nate ButlerandMarshall Bowers f765757bc5 Fix typos 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:28:22 -05:00
Nate ButlerandMarshall Bowers 6bff060364 Add additional cursors to gpui2 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:20:41 -05:00
Nate Butler 66e53df7df Update toolbar left tool group 2023-12-04 11:14:59 -05:00
Nate Butler 0767dae65a Ensure disabled buttons don't have interaction styles 2023-12-04 09:37:56 -05:00
Nate Butler 1a4d8f1826 Prevent tab bar from growing in height when a tab is added 2023-12-04 09:24:08 -05:00
Nate Butler a7f3f63463 Update empty pane state 2023-12-04 09:13:00 -05:00
Kirill Bulatov 03361b4a58 Log project path that was no open due to no project entry found 2023-12-04 12:45:57 +02:00
Conrad Irwin b74b17c4f5 In-flight entertainment (#3484) 
- +language_selector2
- Language Selector 2 working!
- Prevent languages showing in wrong order first
- copilot_menu2 (though only tested offling, which is insufficient)
- Dismiss tooltips at capture
- Get ChannelModal opening

[[PR Description]]

Release Notes:

-  N/A
 2023-12-03 13:06:29 -07:00
Conrad Irwin 0b142a2b3b Get ChannelModal opening 2023-12-02 00:57:41 -07:00
Conrad Irwin b597e4346f Dismiss tooltips at capture 
(Otherwise they stay open when you hover over the editor, which
stops mouse move events propagating)
 2023-12-01 23:51:06 -07:00
Conrad Irwin 3d93aa7421 copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6025c88b72 Prevent languages showing in wrong order first 2023-12-01 21:26:23 -07:00
Conrad Irwin 94e188da8f Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Conrad Irwin 89bbc801d0 +language_selector2 2023-12-01 21:23:20 -07:00
Max Brunsfeld 18d2c02a93 Bump RPC protocol version in zed2 to match zed1 (#3482) 2023-12-01 13:14:49 -08:00
Max Brunsfeld 422d5df194 Bump RPC protocol version in zed2 to match zed1 2023-12-01 13:08:45 -08:00
Max Brunsfeld 65f0bf8802 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 8799532ef8 Fix retrieval of app version in auto_update2 2023-12-01 12:52:26 -08:00
Max Brunsfeld 3ae0ceaed8 collab 0.29.1 2023-12-01 11:50:05 -08:00
Max Brunsfeld 863c7600b0 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 27b62e0898 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Marshall Bowers 263eaec9c8 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 3e1f07f55f 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 dd8a0a766c 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 ba3e8870bd Add selected_icon to IconButton 2023-12-01 13:10:53 -05:00
Marshall Bowers 859e5686a7 Clean up some ButtonLike doc comments 2023-12-01 13:09:35 -05:00
Julia 9b5fd4618d 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 6b15042433 Merge branch 'main' into zed2-breadcrumbs 2023-12-01 12:28:36 -05:00
Nate Butler acbeafea3a 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 c4a1527a40 I'm a dunce 2023-12-01 11:47:04 -05:00
Nate Butler 6382cedd6f 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 63f1829187 Revert "editor tests: Reintroduce block_on_ticks." 
This reverts commit 80eaa647ce.
 2023-12-01 17:24:20 +01:00
Piotr OsiewiczandAntonio 80eaa647ce editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:22:12 +01:00
Julia 46e8e35f4d Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Nate Butler 26a34fe62f Update collab_titlebar_item.rs 2023-12-01 10:52:11 -05:00
Nate Butler a24d4920fd Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00
Julia 2d4f00fdf1 Unbreak toolbar layout & improve disabling ButtonLike 2023-12-01 10:33:44 -05:00
Antonio Scandurra 662695ed46 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 1d8623c379 Add mouse context menu to editor2 
Co-Authored-By: Piotr <piotr@zed.dev>
 2023-12-01 16:01:56 +01:00
Antonio Scandurra 09bc268398 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 c195daa651 Respond to modifiers changed event in editor2 and set cursor 2023-12-01 14:26:49 +01:00
Antonio Scandurra 8920271d1b Uncomment git gutter painting 2023-12-01 13:45:14 +01:00
Antonio Scandurra 6effa83e31 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 603181a09c Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Antonio Scandurra c29b7af449 Register NewFile and NewFileInDirection from Editor 2023-12-01 12:11:54 +01:00
Antonio Scandurra 422b8559ed Re-enable opening excerpts in Editor 2023-12-01 12:03:21 +01:00
Antonio Scandurra bf5dd7ca97 Re-introduce auto-height in editor2 (#3471) 
Release Notes:

- N/A
 2023-12-01 12:02:45 +01:00
Antonio Scandurra c518916af2 🔥 2023-12-01 11:53:47 +01:00