Nathan Sobo
72b9dc8216
Merge remote-tracking branch 'origin/main' into editor2
2023-11-02 20:47:09 -06:00
Nathan Sobo
6a89f7ce4f
rich text2 ( #3220 )
...
- git -> git3
- Add rich_text2
[[PR Description]]
Release Notes:
N/A
2023-11-02 20:46:45 -06:00
Nathan Sobo
2a12e8f307
Merge remote-tracking branch 'origin/rich_text2' into editor2
2023-11-02 20:34:52 -06:00
Nate Butler
383d9129f4
[Not compiling] Continue working on VSCode import
2023-11-02 21:49:26 -04:00
Conrad Irwin
0b3932f38c
Convert rich_text2
2023-11-02 19:30:33 -06:00
Conrad Irwin
6ecb4805f7
Add rich_text2
2023-11-02 19:19:18 -06:00
Conrad Irwin
cbd902658c
git -> git3
...
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Conrad Irwin
0aabb19a45
Into the woods
2023-11-02 18:52:08 -06:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
0d0b6db24f
Update theme importer
2023-11-02 20:15:51 -04:00
Nate Butler
8d09baa3a5
Remove unintentionally committed txt file
2023-11-02 20:06:35 -04:00
Nate Butler
2b0c959137
Add terminal colors to ThemeColors, add _background to some color names.
2023-11-02 19:53:52 -04:00
Nathan Sobo
9052b48949
Use correct color values in quad fragment shader ( #3217 )
...
Previously, when using rounded corners, the borders would get wider.
Looks like we weren't using the input color values consistently in the
fragment shader. The quad values are raw HSLA and are converted in the
vertex shader.
Release Notes:
- N/A
2023-11-02 17:49:56 -06:00
Marshall Bowers
95a0827517
Clean up unused code
2023-11-02 19:20:21 -04:00
Marshall Bowers
152ac6927f
Add themes2/src/themes directory
2023-11-02 19:17:39 -04:00
Marshall Bowers
d1636bf16b
Finish up theme printer
2023-11-02 19:14:51 -04:00
Marshall Bowers
fc376287e0
Start work on theme printer
2023-11-02 18:57:13 -04:00
Nathan Sobo
7b712ac68f
WIP
2023-11-02 16:47:14 -06:00
Marshall Bowers
0bc51382b2
Add basic VsCodeThemeConverter
2023-11-02 18:24:38 -04:00
Marshall Bowers
e48332c81f
Parse VSCode theme files
2023-11-02 18:00:55 -04:00
Conrad Irwin
583c36e24b
WIP
2023-11-02 15:27:49 -06:00
Nate Butler and Marshall Bowers
058981350c
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-02 17:21:11 -04:00
Conrad Irwin
09efa017d4
Editor2
2023-11-02 14:36:42 -06:00
Conrad Irwin and Nathan
9e5275cc18
Fix error handling of open_path
...
Co-Authored-By: Nathan <nathan@zed.dev >
2023-11-02 14:34:43 -06:00
Nate Butler
972f076b4d
Deserialize theme metadata
2023-11-02 16:31:22 -04:00
Nate Butler
58ac7f2926
[Broken] Load a src theme in test
2023-11-02 16:26:27 -04:00
Marshall Bowers
54969877a4
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
6eeaa64e62
workspace2 ( #3188 )
...
Tracking PR for workspace port
2023-11-02 13:34:19 -06:00
Conrad Irwin
8283909dfd
Disable selective warnings to make cargo check happy
2023-11-02 13:28:58 -06:00
Nathan Sobo and Julia Risley
91f3e9707a
Use correct color values in quad fragment shader
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-11-02 13:18:20 -06:00
Conrad Irwin
269a72464d
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 13:16:24 -06:00
Mikayla Maki
85f0959548
Remove the 2s from source code ( #3216 )
...
Release Notes:
- N/A
2023-11-02 12:11:16 -07:00
Marshall Bowers
9c8220d04e
Remove commented-out label code
2023-11-02 15:04:52 -04:00
Nate Butler
809d8786f1
WIP
2023-11-02 14:54:53 -04:00
Marshall Bowers
3605afc163
Render active item in pane
2023-11-02 14:40:34 -04:00
Nathan Sobo
d1cb2d3e11
Enforce Send bound on next frame callback functions, because they're invoked on arbitrary threads ( #3215 )
...
This enforces the send bound, then uses an async task looping on a
channel to run callbacks on the main thread.
2023-11-02 12:36:38 -06:00
Marshall Bowers
8b1b7a2f80
Checkpoint: Basic tab bar structure
2023-11-02 14:34:48 -04:00
Nathan Sobo
29d8390743
Fix formatting
2023-11-02 12:28:58 -06:00
Nathan Sobo
1dd20d4c0a
Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow
2023-11-02 12:25:06 -06:00
Nate Butler
004c5d309b
WIP
2023-11-02 14:23:43 -04:00
Nathan Sobo and Julia Risley
04a8ee222b
Enforce a Send bound on next frame callbacks
...
This required using mpsc channels to invoke frame callbacks on the
main thread and send the receiver to the platform display link.
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-11-02 12:01:22 -06:00
Mikayla
d11ff14b57
Remove the 2s from source code
2023-11-02 10:55:02 -07:00
Conrad Irwin
5a41eed120
WIP
2023-11-02 11:34:31 -06:00
Marshall Bowers
1e7a216d55
WIP
2023-11-02 13:21:28 -04:00
Conrad Irwin and Antonio
8f0f5a9ba1
Render status bar
...
Co-Authored-By: Antonio <me@as-cii.com >
2023-11-02 11:18:11 -06:00
Conrad Irwin and Antonio
803d2b6710
Add double click to zoom the window
...
Co-Authored-By: Antonio <me@as-cii.com >
2023-11-02 10:58:46 -06:00
Marshall Bowers
0e1d2fdf21
Checkpoint: Narrow down error
2023-11-02 12:47:06 -04:00
Marshall Bowers
66e4d75e6f
Checkpoint: Reproduction with Avatar story
2023-11-02 12:34:40 -04:00
Conrad Irwin and Mikayla
bd54bfa4e1
Render titlebar
...
Co-Authored-By: Mikayla <mikayla@zed.dev >
2023-11-02 10:31:18 -06:00
Conrad Irwin and Antonio
634aba89d2
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
Nate Butler
Conrad Irwin
Marshall Bowers
Mikayla Maki
