Marshall Bowers
8f1c74b8bc
Factor out LabelLike to share common label styles ( #3510 )
...
This PR factors out a new `LabelLike` component to share common styles
between the `Label` and `HighlightedLabel` components.
Release Notes:
- N/A
2023-12-06 11:17:12 -05:00
Max Brunsfeld
5b6fd3ac1d
Implement following and more collaboration panel features in zed2 ( #3504 )
2023-12-05 13:59:15 -08:00
Max Brunsfeld
863222edc5
Get following working
...
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
2023-12-05 12:57:23 -08:00
Nate Butler
27703a3279
Update tabs rendering, fix tab spacing bug
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-05 14:04:12 -05: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
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
Max Brunsfeld
c63ca09eed
Reintroduce pane navigation history in zed2
2023-11-30 12:10:25 -08:00
Conrad Irwin
75afb65b26
Show cursor position in status bar
2023-11-30 10:16:24 -07:00
Nate Butler
453aa5ffd7
TextColor -> Color
2023-11-21 01:05:29 -05:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Mikayla
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Julia
3655a96e54
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
f4eb219c75
Get diagnostics view almost building in the zed2 world
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-17 16:32:35 -05:00
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01:00
Mikayla
9a3cd073c7
Restore a bunch of random workspace stuff
2023-11-16 23:05:28 -08:00
Piotr Osiewicz
6b6a30c3da
Merge branch 'main' into search2
2023-11-16 17:16:15 +01:00
Mikayla
78cea69172
Add focusable view and restore workspace deserialization. Partially restore split and tab functions
2023-11-15 16:36:43 -08:00
Piotr Osiewicz
b11bfa8821
Merge branch 'main' into search2
2023-11-15 12:54:26 +01:00
Conrad Irwin
37d0b8424c
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
76c15229c1
Combine LabelColor and IconColor into TextColor
2023-11-14 13:48:01 -05:00
Piotr Osiewicz
08dde94299
WIP styling
...
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 17:59:53 +01:00
Piotr Osiewicz
6c69e40e5c
WIP
2023-11-14 16:56:31 +01:00
Nathan Sobo
364e3e7de5
Merge remote-tracking branch 'origin/main' into element-types
2023-11-14 01:55:58 -07:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Nate Butler
dd434588ee
WIP
2023-11-13 17:38:44 -05:00
Piotr Osiewicz
dfd68d4cb8
WIP: start search2
2023-11-13 20:38:37 +01:00
Max Brunsfeld
6b8ce3cc85
Add a setting for when to seed the search query from the text under the cursor
2023-11-09 14:03:14 -08:00
Max Brunsfeld
dba41e99dd
Avoid suggesting search query if cursor is not on a word
2023-11-09 12:33:30 -08:00
Mikayla
3c57b912b9
Update editor to use new event emitter
2023-11-08 19:52:43 -08:00
Marshall Bowers
74853ea55f
Rename ThemeVariant to Theme ( #3252 )
...
This PR renames the `ThemeVariant` type to `Theme`.
This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.
Release Notes:
- N/A
2023-11-07 10:41:36 -05:00
Antonio Scandurra
6ae09634ce
Remove focused field and use FocusHandle instead in Editor
2023-11-07 12:46:31 +01:00
Conrad Irwin
0edcec7c4e
Fix tab text colors
2023-11-03 09:12:12 -06:00
Antonio Scandurra
b21c25826d
Make tab bar visible
2023-11-03 15:51:33 +01:00
Antonio Scandurra
3e8fcefaef
Remove more todos
2023-11-03 14:42:26 +01:00
Antonio Scandurra
77e3c7f8ee
WIP
2023-11-03 12:10:15 +01:00
Antonio Scandurra
6fc7b17259
Expose a focus handle from workspace::Item
2023-11-03 11:00:57 +01:00
Nathan Sobo
fbee6b5352
Get editor2 compiling with a ton of code commented out
2023-11-02 23:35:20 -06:00
Nathan Sobo
f3b8a9d8c2
WIP
2023-11-02 22:56:04 -06:00
Nathan Sobo
dfc7c81500
WIP
2023-11-02 21:03:29 -06:00
Conrad Irwin
0aabb19a45
Into the woods
2023-11-02 18:52:08 -06:00
Nathan Sobo
7b712ac68f
WIP
2023-11-02 16:47:14 -06:00
Conrad Irwin
583c36e24b
WIP
2023-11-02 15:27:49 -06:00
Conrad Irwin
09efa017d4
Editor2
2023-11-02 14:36:42 -06:00
