 Marshall Bowers
|
2b71c49fa6
|
Clean up some warnings
|
2023-10-25 20:40:50 +02:00 |
|
|
Marshall Bowers
|
a3a72b77cc
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 20:38:03 +02:00 |
|
|
Marshall Bowers
|
b219cfad15
|
Load themes from settings and rework Settings trait
|
2023-10-25 20:37:55 +02:00 |
|
|
Antonio Scandurra
|
b7f332b02a
|
Assert handles are passed to the right contexts
|
2023-10-25 19:46:13 +02:00 |
|
|
|
18c036f7ae
|
Add fs2
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
|
2023-10-25 19:17:50 +02:00 |
|
|
Antonio Scandurra
|
de8fde7026
|
Stop depending on gpui in client2 and settings2
|
2023-10-25 18:47:03 +02:00 |
|
|
|
500fa432e3
|
Implement os_name, os_version and app_version for TestPlatform
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
|
2023-10-25 18:30:06 +02:00 |
|
|
|
fd8fee310b
|
Implement TestAppContext::new
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
|
2023-10-25 18:28:05 +02:00 |
|
|
Marshall Bowers
|
9c3de407fb
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 18:20:22 +02:00 |
|
|
Marshall Bowers
|
edf6820252
|
Make theme converter spit out valid Rust structs
|
2023-10-25 18:20:16 +02:00 |
|
|
|
d4f64bc799
|
Allow different app contexts to race
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
Co-Authored-By: Conrad <conrad@zed.dev>
|
2023-10-25 18:11:38 +02:00 |
|
|
|
193feb5708
|
Introduce TestAppContext
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
|
2023-10-25 17:55:20 +02:00 |
|
|
Antonio Scandurra
|
374cadd920
|
Fix error
|
2023-10-25 17:41:40 +02:00 |
|
|
Marshall Bowers
|
07175ea3d0
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 17:38:52 +02:00 |
|
|
Marshall Bowers
|
a47eb2d762
|
theme2: Add Rosé Pine themes
|
2023-10-25 17:38:48 +02:00 |
|
|
|
0dc4044882
|
Add deterministic TestDispatcher
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
|
2023-10-25 17:33:55 +02:00 |
|
|
Marshall Bowers
|
acaba6a9ff
|
theme2: Add Sandcastle theme
|
2023-10-25 17:27:25 +02:00 |
|
|
Marshall Bowers
|
86236740c9
|
Print out Theme structs in theme_converter
|
2023-10-25 17:24:34 +02:00 |
|
|
Marshall Bowers
|
e4603292eb
|
Start work on theme converter
|
2023-10-25 16:54:26 +02:00 |
|
|
Marshall Bowers
|
412d023056
|
Rename player to players
|
2023-10-25 16:39:06 +02:00 |
|
|
Marshall Bowers
|
a7d93134bb
|
Remove reference to removed ThemeColor
|
2023-10-25 16:34:03 +02:00 |
|
|
Marshall Bowers
|
f4fad48264
|
Add note about fixing dead_code and unused_variables warnings in ui2
|
2023-10-25 16:33:33 +02:00 |
|
|
Marshall Bowers
|
3c859599a0
|
Remove ThemeColor in favor of theme2::Theme
|
2023-10-25 16:32:44 +02:00 |
|
|
Marshall Bowers
|
c1e03b9859
|
Rename theme2 getter to theme
|
2023-10-25 16:04:49 +02:00 |
|
|
Marshall Bowers
|
8b25d94ada
|
Rename theme getter to old_theme
|
2023-10-25 16:02:47 +02:00 |
|
|
Marshall Bowers
|
48100849a2
|
Reference theme2 colors in ThemeColor
|
2023-10-25 15:58:56 +02:00 |
|
|
Marshall Bowers
|
98c2331f3a
|
Load Theme from theme2 into the storybook
|
2023-10-25 15:50:50 +02:00 |
|
|
Kirill BulatovandNathan Sobo
|
a7b792e5ab
|
Add OS file drop event handler
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-10-24 19:26:06 +02:00 |
|
|
Marshall Bowers
|
25b37522c7
|
Update Cargo.lock
|
2023-10-24 18:25:48 +02:00 |
|
|
Kirill Bulatov
|
cf354de5e0
|
Fix compilation
|
2023-10-24 18:22:26 +02:00 |
|
|
Marshall Bowers
|
b7d8756f93
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-24 17:58:42 +02:00 |
|
|
Marshall Bowers
|
29e72d4d10
|
Rename cx.global_default_mut to cx.global_default
|
2023-10-24 17:58:14 +02:00 |
|
|
Marshall Bowers
|
9fb7fe1aed
|
Finish up ThemeRegistry and remove AnyAssetSource
|
2023-10-24 17:47:41 +02:00 |
|
|
Marshall Bowers
|
f6589a14be
|
Merge branch 'zed2' into theme2
|
2023-10-24 17:29:25 +02:00 |
|
|
Marshall Bowers
|
6b926ac077
|
Checkpoint
|
2023-10-24 17:29:03 +02:00 |
|
|
Kirill Bulatov
|
ba8bd2f703
|
Make audio2
|
2023-10-24 17:15:59 +02:00 |
|
|
Marshall Bowers
|
89f700c938
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-24 17:00:11 +02:00 |
|
|
Marshall Bowers
|
4efbbfd134
|
WIP
|
2023-10-24 16:59:24 +02:00 |
|
|
Marshall Bowers
|
e0df16938a
|
Add AnyAssetSource
|
2023-10-24 16:59:01 +02:00 |
|
|
Kirill Bulatov
|
46c9fd2f9a
|
Finish ???-ing project2.rs
|
2023-10-24 16:35:34 +02:00 |
|
|
Antonio Scandurra
|
a184c6aa02
|
Checkpoint
|
2023-10-24 16:15:20 +02:00 |
|
|
Antonio Scandurra
|
1e2abb8a0f
|
Checkpoint
|
2023-10-24 15:30:16 +02:00 |
|
|
Antonio Scandurra
|
0ea159d17c
|
Checkpoint
|
2023-10-24 15:18:51 +02:00 |
|
|
Nathan Sobo
|
7e9d8921b3
|
Remove failed attempt at eliminating static bounds on entities
|
2023-10-24 15:12:51 +02:00 |
|
|
Nate Butler
|
6dcc9750dd
|
Lower the default state intensities
|
2023-10-24 08:41:39 -04:00 |
|
|
Nate Butler
|
c772d2503c
|
Merge branch 'n/elevation' into zed2
|
2023-10-24 08:34:54 -04:00 |
|
|
Marshall Bowers
|
7a95e51e51
|
Add missing bounds to Themed
|
2023-10-24 14:30:26 +02:00 |
|
|
Nathan Sobo
|
46d4477a8a
|
Merge branch 'fewer-bounds' into zed2
|
2023-10-24 14:24:06 +02:00 |
|
|
Nathan Sobo
|
e2b485a9b2
|
Reduce the need for Send + Sync bounds on generics
|
2023-10-24 14:20:01 +02:00 |
|
|
Marshall Bowers
|
70421df8e9
|
Remove set_ prefix for List setters
|
2023-10-24 14:18:51 +02:00 |
|