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
Max Brunsfeld 1b5bcd5833 Fix centering of empty pane text (#3666) 
The formatting of the empty pane text regressed in #3665, in which I
also made it possible to drag items onto an empty pane.
 2023-12-14 16:44:30 -08:00
Mikayla Maki 3b9965ca36 Merge branch 'main' into perf-2 2023-12-14 16:39:10 -08:00
Max Brunsfeld dbb71b40c7 Fix centering of empty pane text 2023-12-14 16:35:58 -08:00
Max Brunsfeld ed9b54a9a8 Fix stickiness of main pane drag target (#3665) 
Reimplement the pane drag targets using on_drag_move
 2023-12-14 16:30:02 -08:00
Mikayla Maki be59fd1032 Merge branch 'main' into perf-2 2023-12-14 16:25:40 -08:00
Max Brunsfeld 2e5f766302 Fix stickiness of main pane drag target 
Reimplement the pane drag targets using on_drag_move
 2023-12-14 16:23:15 -08:00
Mikayla Maki d8bf1ccba6 Fix dock resizing (#3663) 
This fixes some bugs in the display and tracking of dock resizes

Release Notes:

-
 2023-12-14 16:20:29 -08:00
Nathan Sobo bde23a78d3 Rename draw2 -> draw_and_update_state 2023-12-14 17:20:27 -07:00
Nathan Sobo e89e66090d Merge remote-tracking branch 'origin/main' into perf-2 2023-12-14 17:15:44 -07:00
Mikaylaandconrad e9e31e57aa Fix dock resize handles 
co-authored-by: conrad <conrad@zed.dev>
 2023-12-14 16:05:10 -08:00
Nathan Sobo 88f0572bad Merge remote-tracking branch 'origin/main' into perf-2 2023-12-14 16:56:36 -07:00
Marshall Bowers 586b9073f3 Fix warning in release mode (#3662) 
This PR fixes a warning that was present in release mode, which was
preventing the nightly builds from running:

```
error: variable does not need to be mutable
   --> crates/gpui2/src/elements/div.rs:547:9
    |
547 |     let mut div = Div {
    |         ----^^^
    |         |
    |         help: remove this `mut`
    |
    = note: `-D unused-mut` implied by `-D warnings`
```

Release Notes:

- N/A
 2023-12-14 18:52:14 -05:00
Mikaylaandconrad 831e4a5df4 Fix bug in drag move dispatch 
co-authored-by: conrad <conrad@zed.dev>
 2023-12-14 15:23:24 -08:00
Nate Butler 90bb7c5297 Remove unused imports 2023-12-14 17:56:42 -05:00
Marshall Bowers ae6a3bcf52 Use separate editor foreground color (#3661) 
This PR populates the `editor_foreground` color in the various themes
and updates the editor to use this as the color for text.

The `text` field in the theme should now be used for UI elements, while
`editor_foreground` should be used for buffers.

This improves the contrast in some themes, notably Ayu Dark.

Release Notes:

- N/A
 2023-12-14 17:54:44 -05:00
Nate Butler 882fede4da WIP IconButton story 2023-12-14 17:51:08 -05:00
Max Brunsfeld b74fe577a3 Enable all warnings in workspace, fix all warnings (#3660) 2023-12-14 14:38:28 -08:00
Nate Butler 6bc0c9489a Use updated story container in Text story 2023-12-14 17:38:22 -05:00
Marshall Bowers 3fbef5ff2c Use editor_foreground color in editor 2023-12-14 17:34:07 -05:00
Marshall Bowers 7025944542 Use editor.foreground from VS Code for the editor foreground 2023-12-14 17:30:37 -05:00
Marshall Bowers 5ea31591a7 Emit editor_foreground color from theme converter 2023-12-14 17:28:45 -05:00
Max BrunsfeldandConrad 7813052622 Fix bug in Workspace::activate_pane_in_direction 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-12-14 14:27:44 -08:00
Joseph T. Lyons aab0bdebc1 Use bitflags to hold error states 2023-12-14 17:22:13 -05:00
Max Brunsfeld da00f99421 Re-enable cmd-<number> key bindings for activating panes (#3659) 2023-12-14 14:16:43 -08:00
Max BrunsfeldandConrad c1ab213af1 Enable all warnings in workspace, fix all warnings 
Bring back some workspace tests

Co-authored-by: Conrad <conrad@zed.dev>
 2023-12-14 14:15:56 -08:00
Nathan Sobo 336acd490e Don't move in paint 2023-12-14 15:15:18 -07:00
Julia aecb8f68c9 Render panel in this test to make sure it can receive focus 2023-12-14 17:11:00 -05:00
Nate Butler 543d1b5783 Continue styling new story components 2023-12-14 16:52:05 -05:00
Max Brunsfeld 52588a4420 Enable dragging from project panel to panes (#3658) 
Rework gpui2 drag API so that receivers need not specify the dragged
view type.
 2023-12-14 13:32:40 -08:00
Max BrunsfeldandConrad 19c4494dd5 Re-enable cmd-<number> key bindings for activating panes 
co-authored-by: Conrad <conrad@zed.dev>
 2023-12-14 13:30:11 -08:00
MikaylaMaxConrad
 		9079d8dcf4 Enable dragging from project panel to panes 
Rework gpui2 drag API so that receivers need not specify the dragged view type.

co-authored-by: Max <max@zed.dev>
co-authored-by: Conrad <conrad@zed.dev>
 2023-12-14 13:20:48 -08:00
Nathan Sobo a559127e63 Merge remote-tracking branch 'origin/main' into perf-2 2023-12-14 14:16:59 -07:00
Joseph T. Lyons 8f4b904dba Add some TODOs 2023-12-14 16:10:53 -05:00
Marshall Bowers 951d389568 Style "Replace in project" input in project search (#3657) 
This PR styles the "Replace in project" input in the project search.

Release Notes:

- N/A
 2023-12-14 16:10:22 -05:00
Nathan Sobo 0c25758ea9 Use FxHashMap for element state 2023-12-14 14:06:19 -07:00
Joseph T. Lyons ee35d2ecc6 Tweak wording 2023-12-14 16:04:53 -05:00
Marshall Bowers 04d11a80cc Style "Replace in project" input 2023-12-14 15:58:17 -05:00
Marshall Bowers ce285cafbc Fix toolbar flex sizing 2023-12-14 15:57:06 -05:00
Nate ButlerandMarshall Bowers 7ad611839c Extend Story components, allow linking to story file 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-14 15:55:17 -05:00
Joseph T. Lyons 6d47bfe8c8 Add contributing guide 2023-12-14 15:54:31 -05:00
Conrad Irwin 9325b9f1e9 Ignore invisible layers for mouse events (#3651) 
Fixes clicking in the top/bottom 100px of the editor


Release Notes:

- N/A
 2023-12-14 12:01:45 -07:00
Marshall Bowers 41f2bd006c Style inputs in project search (#3655) 
This PR styles the inputs in the project search.

<img width="772" alt="Screenshot 2023-12-14 at 1 53 28 PM"
src="https://github.com/zed-industries/zed/assets/1486634/fe2362be-79db-4551-a473-2acf7a8a1bcb">

Release Notes:

- N/A
 2023-12-14 13:58:11 -05:00
Nathan Sobo 1df02f29e6 Make z_indices bigger in StackingOrder 2023-12-14 11:37:48 -07:00
Nathan Sobo 0d91972947 Don't allocate interactive bounds 2023-12-14 11:28:52 -07:00
Joseph T. Lyons bb32f705a4 Prep feedback code for testing 2023-12-14 13:22:41 -05:00
Marshall Bowers 7e09a21bd6 Hide the toolbar if it has no visible items (#3654) 
This PR makes the toolbar hide itself if it has no visible items.

This removes the double border beneath the tab bar when there are no
visible tools in the toolbar.

Release Notes:

- N/A
 2023-12-14 13:02:27 -05:00
Conrad Irwin 1640668f61 Refactor editor to be more clear about stacking 2023-12-14 10:48:15 -07:00
Conrad Irwin da8b21382b Fix z-indexes in editor element 
* Ensure that scroll events from blocks scroll the editor
* Ensure that scroll bars show behind hover things
 2023-12-14 10:36:16 -07:00
Nathan Sobo bb72cc1126 WIP 2023-12-14 10:31:45 -07:00
Marshall Bowers 329321ee6e Improve storybook story selection (#3653) 
This PR builds on top of #3652 by adding a selection prompt to the
storybook to allow you to choose from the available list of stories if
you don't provide one explicitly:

<img width="1387" alt="Screenshot 2023-12-14 at 12 00 26 PM"
src="https://github.com/zed-industries/zed/assets/1486634/640d62a3-1340-45f1-9746-69b513faff62">

This way we don't have to keep generating the `script/storybook` script
whenever stories are added/removed.

#### Usage (through `cargo`):

```sh
# Select from the available stories
cargo run -p storybook2

# Run a specific story
cargo run -p storybook2 -- components/list_item
```

#### Usage (through `script/storybook`):

```sh
# Select from the available stories
./script/storybook

# Run a specific story
./script/storybook list_item
```

Release Notes:

- N/A
 2023-12-14 12:13:02 -05:00