 Marshall Bowers
|
7ec9cc08c7
|
Fix z-index targeting for drag and drop
|
2023-10-25 20:49:40 +02:00 |
|
|
Marshall Bowers
|
5355007719
|
Clean up some warnings
|
2023-10-25 20:40:50 +02:00 |
|
|
Marshall Bowers
|
b5eae86b67
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 20:38:03 +02:00 |
|
|
Marshall Bowers
|
e67048ee7b
|
Load themes from settings and rework Settings trait
|
2023-10-25 20:37:55 +02:00 |
|
|
Antonio Scandurra
|
5ba04dce2b
|
Assert handles are passed to the right contexts
|
2023-10-25 19:46:13 +02:00 |
|
|
|
412c0ff7dc
|
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
|
9986e526e5
|
Stop depending on gpui in client2 and settings2
|
2023-10-25 18:47:03 +02:00 |
|
|
|
1b75603f63
|
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 |
|
|
|
52f9f90ccb
|
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
|
98e2490807
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 18:20:22 +02:00 |
|
|
Marshall Bowers
|
a0fe859d87
|
Make theme converter spit out valid Rust structs
|
2023-10-25 18:20:16 +02:00 |
|
|
|
51fb33d8ef
|
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 |
|
|
|
92535ba2c4
|
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
|
6f6495ccbf
|
Fix error
|
2023-10-25 17:41:40 +02:00 |
|
|
Marshall Bowers
|
08a4e53cfe
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-25 17:38:52 +02:00 |
|
|
Marshall Bowers
|
c8a86c2dd1
|
theme2: Add Rosé Pine themes
|
2023-10-25 17:38:48 +02:00 |
|
|
|
3566d920c5
|
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
|
cee8175c19
|
theme2: Add Sandcastle theme
|
2023-10-25 17:27:25 +02:00 |
|
|
Marshall Bowers
|
751df45263
|
Print out Theme structs in theme_converter
|
2023-10-25 17:24:34 +02:00 |
|
|
Marshall Bowers
|
6b5947a1fa
|
Start work on theme converter
|
2023-10-25 16:54:26 +02:00 |
|
|
Marshall Bowers
|
437d147935
|
Rename player to players
|
2023-10-25 16:39:06 +02:00 |
|
|
Marshall Bowers
|
0867175a4e
|
Remove reference to removed ThemeColor
|
2023-10-25 16:34:03 +02:00 |
|
|
Marshall Bowers
|
4fcbc91aca
|
Add note about fixing dead_code and unused_variables warnings in ui2
|
2023-10-25 16:33:33 +02:00 |
|
|
Marshall Bowers
|
e1032c5341
|
Remove ThemeColor in favor of theme2::Theme
|
2023-10-25 16:32:44 +02:00 |
|
|
Marshall Bowers
|
bb3f59252e
|
Rename theme2 getter to theme
|
2023-10-25 16:04:49 +02:00 |
|
|
Marshall Bowers
|
258496700f
|
Rename theme getter to old_theme
|
2023-10-25 16:02:47 +02:00 |
|
|
Marshall Bowers
|
8043d0d8a9
|
Reference theme2 colors in ThemeColor
|
2023-10-25 15:58:56 +02:00 |
|
|
Marshall Bowers
|
dd34bb273e
|
Load Theme from theme2 into the storybook
|
2023-10-25 15:50:50 +02:00 |
|
|
Kirill BulatovandNathan Sobo
|
a01b507ef4
|
Add OS file drop event handler
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-10-24 19:26:06 +02:00 |
|
|
Marshall Bowers
|
5b04f965fa
|
Update Cargo.lock
|
2023-10-24 18:25:48 +02:00 |
|
|
Kirill Bulatov
|
77991ad865
|
Fix compilation
|
2023-10-24 18:22:26 +02:00 |
|
|
Marshall Bowers
|
afad2fbfa2
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-24 17:58:42 +02:00 |
|
|
Marshall Bowers
|
d6bd000aa8
|
Rename cx.global_default_mut to cx.global_default
|
2023-10-24 17:58:14 +02:00 |
|
|
Marshall Bowers
|
4ca7ddfc42
|
Finish up ThemeRegistry and remove AnyAssetSource
|
2023-10-24 17:47:41 +02:00 |
|
|
Marshall Bowers
|
51c66f508b
|
Merge branch 'zed2' into theme2
|
2023-10-24 17:29:25 +02:00 |
|
|
Marshall Bowers
|
4740d6ed61
|
Checkpoint
|
2023-10-24 17:29:03 +02:00 |
|
|
Kirill Bulatov
|
18930c33fe
|
Make audio2
|
2023-10-24 17:15:59 +02:00 |
|
|
Marshall Bowers
|
5fb8321ee0
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
|
2023-10-24 17:00:11 +02:00 |
|
|
Marshall Bowers
|
09866ec3e9
|
WIP
|
2023-10-24 16:59:24 +02:00 |
|
|
Marshall Bowers
|
9f8aaa4cdb
|
Add AnyAssetSource
|
2023-10-24 16:59:01 +02:00 |
|
|
Kirill Bulatov
|
1ad7f3a16d
|
Finish ???-ing project2.rs
|
2023-10-24 16:35:34 +02:00 |
|
|
Antonio Scandurra
|
11953e613b
|
Checkpoint
|
2023-10-24 16:15:20 +02:00 |
|
|
Antonio Scandurra
|
9aaf7d0c46
|
Checkpoint
|
2023-10-24 15:30:16 +02:00 |
|
|
Antonio Scandurra
|
191285a8f1
|
Checkpoint
|
2023-10-24 15:18:51 +02:00 |
|
|
Nathan Sobo
|
9f9137cf76
|
Remove failed attempt at eliminating static bounds on entities
|
2023-10-24 15:12:51 +02:00 |
|
|
Nate Butler
|
9f48cdac83
|
Lower the default state intensities
|
2023-10-24 08:41:39 -04:00 |
|
|
Nate Butler
|
bfb37bbe94
|
Merge branch 'n/elevation' into zed2
|
2023-10-24 08:34:54 -04:00 |
|
|
Marshall Bowers
|
8117e7933c
|
Add missing bounds to Themed
|
2023-10-24 14:30:26 +02:00 |
|
|
Nathan Sobo
|
2285a35016
|
Merge branch 'fewer-bounds' into zed2
|
2023-10-24 14:24:06 +02:00 |
|
|
Nathan Sobo
|
0910760b76
|
Reduce the need for Send + Sync bounds on generics
|
2023-10-24 14:20:01 +02:00 |
|