Max Brunsfeld
61c65bcfaf
Merge branch 'main' into picker
2023-11-07 16:57:47 -08:00
Max Brunsfeld and Marshall
60c1d02011
Get basic text input working
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 16:33:02 -08:00
Max Brunsfeld
0e83f26b44
Remove unused import
2023-11-07 11:47:49 -08:00
Mikayla Maki
a729ad29f1
Merge branch 'main' into picker
2023-11-07 11:44:02 -08:00
Max Brunsfeld
2a38753bb8
Merge branch 'main' into picker
2023-11-07 11:27:14 -08:00
Conrad Irwin
43f553a161
Wire up GoToLine modal
2023-11-07 12:12:05 -07:00
6f2ddc9abe
Add Modals
...
P.S. this is all completely different now
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Julia <julia@zed.dev >
2023-11-07 09:18:34 -07:00
Marshall Bowers
a9db13e190
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
Conrad Irwin
20eb31b450
Merge branch 'main' into editor2-rendering
2023-11-06 11:06:43 -07:00
Conrad Irwin
d7f608c1e2
tooltip2 ( #3237 )
...
- Fix executor.timer() in gpui2
- Add support for tooltips
[[PR Description]]
Release Notes:
- N/A
2023-11-06 10:51:01 -07:00
c905d4f66d
Rename fields in ThemeColors ( #3242 )
...
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.
This will help prevent this branch from diverging too far from `main`.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-06 11:53:27 -05:00
Julia and Conrad Irwin
e56b9f7f45
Move more tooltip logic into gpui2 & fix tooltip moving on paint
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
2023-11-03 18:37:15 -04:00
Julia and Conrad Irwin
438dcffdad
Tooltips in mouse event handler & fix executor timer
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
2023-11-03 18:02:58 -04:00
Marshall Bowers
95216af9d5
Remove unneeded type qualification
2023-11-03 16:40:46 -04:00
Marshall Bowers
137c08c810
Use an IconButton for the tab close button
2023-11-03 16:36:02 -04:00
Conrad Irwin and Julia
5687664b81
Tooltip on tabs
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-03 14:02:46 -06:00
Conrad Irwin
b2c983034b
gpui2: Add on_hover events
2023-11-03 12:51:38 -06:00
Conrad Irwin
48800ad097
Add PointingHand on tabs
2023-11-03 11:30:15 -06:00
aebf31819c
Add hover behaviour to tabs
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Nathan <nathan@zed.dev >
2023-11-03 10:55:07 -06:00
Conrad Irwin
db23fbd69d
Make the close button close
2023-11-03 09:20:27 -06:00
Antonio Scandurra
3958abaa90
Ensure panes cover the available space
2023-11-03 16:14:03 +01:00
Conrad Irwin
5032e61f73
Fix tab text colors
2023-11-03 09:12:12 -06:00
Kyle Caverly
e216233676
added workspace event for WorkspaceCreated ( #3222 )
...
added workspace2 event for WorkspaceCreated
Release Notes:
- NA
2023-11-03 11:06:11 -04:00
Antonio Scandurra
78393c3e21
Make tab bar visible
2023-11-03 15:51:33 +01:00
Antonio Scandurra
305c7b29a2
Merge remote-tracking branch 'origin/main' into editor2
2023-11-03 14:47:49 +01:00
Antonio Scandurra
c4c9ce9be2
Remove more todos
2023-11-03 14:42:26 +01:00
KCaverly
a378036917
added workspace event for WorkspaceCreated
2023-11-03 08:52:18 -04:00
Kirill Bulatov
574176ae6d
Remove and add more todosmerge .
2023-11-03 13:22:11 +02:00
Antonio Scandurra
82306268bf
WIP
2023-11-03 12:10:15 +01:00
Kirill Bulatov
24a215e4fd
Uncomment persistence tests
2023-11-03 12:38:09 +02:00
Antonio Scandurra
5bf492fa8c
Fix a todo in workspace
2023-11-03 11:36:39 +01:00
Antonio Scandurra
0de4fb1925
Expose a focus handle from workspace::Item
2023-11-03 11:00:57 +01:00
Antonio Scandurra
252bac2e2e
Uncomment more editor code
2023-11-03 10:09:00 +01:00
Antonio Scandurra
f2d987c0ee
Call editor::init
2023-11-03 09:06:25 +01:00
Nathan Sobo
b7dfb4eeb4
WIP
2023-11-02 22:56:04 -06:00
Nathan Sobo
7c2b802283
WIP
2023-11-02 21:03:29 -06:00
Nathan Sobo
63d08003aa
Merge remote-tracking branch 'origin/rich_text2' into editor2
2023-11-02 20:34:52 -06:00
Conrad Irwin
0fca49be33
WIP
2023-11-02 15:27:49 -06:00
Marshall Bowers
5bb88445e5
Make the Zed2 window movable ( #3218 )
...
This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.
Release Notes:
- N/A
2023-11-02 16:17:31 -04:00
Conrad Irwin
13b85165d3
Disable selective warnings to make cargo check happy
2023-11-02 13:28:58 -06:00
Conrad Irwin
fdeff77625
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 13:16:24 -06:00
Marshall Bowers
0a49ddb9e3
Remove commented-out label code
2023-11-02 15:04:52 -04:00
Marshall Bowers
28a31b6b74
Render active item in pane
2023-11-02 14:40:34 -04:00
Marshall Bowers
54ea96f3b0
Checkpoint: Basic tab bar structure
2023-11-02 14:34:48 -04:00
Conrad Irwin
d8f6dd8d39
WIP
2023-11-02 11:34:31 -06:00
Conrad Irwin and Antonio
38c49ea4a7
Render status bar
...
Co-Authored-By: Antonio <me@as-cii.com >
2023-11-02 11:18:11 -06:00
Conrad Irwin and Antonio
13ab124444
Add double click to zoom the window
...
Co-Authored-By: Antonio <me@as-cii.com >
2023-11-02 10:58:46 -06:00
Conrad Irwin and Mikayla
6605085a27
Render titlebar
...
Co-Authored-By: Mikayla <mikayla@zed.dev >
2023-11-02 10:31:18 -06:00
Conrad Irwin and Antonio
64ddd2696e
Add back some window events for workspace
...
Co-Authored-By: Antonio <me@as-cii.com >
2023-11-02 10:03:03 -06:00
Nathan Sobo
ed895ca952
WIP
2023-11-02 07:46:49 -06:00
Max Brunsfeld