yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Piotr Osiewicz d3d09cb7f9 test_following (passes :)) 2023-12-01 20:25:47 +01:00
Piotr Osiewicz f6e3dbf1c2 Bunch of new tests 2023-12-01 20:23:34 +01:00
Piotr Osiewicz 273762acb3 test_navigation_history (pass) 2023-12-01 20:17:41 +01:00
Piotr Osiewicz 09d050097e test_edit_events 2023-12-01 20:16:40 +01:00
Piotr Osiewicz 6c80c0e9ce Display map tests (3 flaky tests for chunks) 2023-12-01 20:14:14 +01:00
Piotr Osiewicz a1efa5142b Another batch of tests 2023-12-01 19:39:53 +01: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
Piotr Osiewicz d3ce63694d Uncomment flaky tests 2023-12-01 19:21:30 +01: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
Piotr Osiewicz 89bd5df2de Another batch of tests 2023-12-01 18:43:44 +01: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
Piotr Osiewicz 2525f9249f Uncomment a bunch of tests in the editor 2023-12-01 18:11:27 +01: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 OsiewiczandAntonio 2f9ce20732 editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:24:47 +01: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
Antonio Scandurra c113762b6e Delete commented out code for editor element 2023-12-01 11:52:40 +01:00
Antonio Scandurra 9bcaacffbb Remove stray dbg statements 2023-12-01 11:49:25 +01:00
Antonio Scandurra 2fe22af4a3 Fix edits not being reported when rewrapping 2023-12-01 11:48:21 +01:00
Joseph T. Lyons 42d12ef80d Close feedback modal when clicking cancel 2023-11-30 22:07:10 -05:00
Joseph T. Lyons 27215013b2 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 ca62d0d968 Move project panel's dispatch_context() to render() 2023-11-30 21:37:41 -05:00
Marshall Bowers 16465bb2e9 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 f5df100bff 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 f139380986 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 51003e46ff 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 c948ffad89 Flesh out a popover control 2023-11-30 16:13:44 -07:00
Max Brunsfeld 04bf9ee4c8 Re-introduce active path tracking in workspace 2023-11-30 14:58:14 -08:00
Max Brunsfeld bcc72567bc Restore auto-save on focus change, re-enable workspace tests 2023-11-30 14:45:27 -08:00