Commit Graph
95 Commits
Author SHA1 Message Date
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 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
Antonio Scandurra 11953e613b Checkpoint 2023-10-24 16:15:20 +02:00
Antonio Scandurra 9aaf7d0c46 Checkpoint 2023-10-24 15:30:16 +02:00
Nathan Sobo 9f9137cf76 Remove failed attempt at eliminating static bounds on entities 2023-10-24 15:12:51 +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
Marshall Bowers 24e21a4c29 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-24 14:11:22 +02:00
Marshall Bowers bb35583998 Merge branch 'gpui2' into zed2 2023-10-24 14:11:13 +02:00
Kirill Bulatov 0e48465adb Add a draft of the mac platform file drag and drop events 2023-10-24 14:09:46 +02:00
Antonio Scandurra 9a53da28bc WIP 2023-10-24 13:10:37 +02:00
Antonio Scandurra 953857f8e3 WIP 2023-10-24 10:31:35 +02:00
Antonio Scandurra 18eb4a7292 WIP 2023-10-24 10:01:19 +02:00
Antonio Scandurra 4d621f355d WIP 2023-10-23 17:41:22 +02:00
Antonio Scandurra 05cbceec24 WIP 2023-10-23 17:36:49 +02:00
Nathan Sobo 192b3512fd Merge branch 'gpui2-drag-drop' into zed2 2023-10-23 17:18:07 +02:00
Nathan Sobo ec0b2e5430 Add on_drop listeners 2023-10-23 16:59:16 +02:00
Antonio Scandurra 7832120a4c WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +02:00
Nathan Sobo 38a7b39070 Don't start dragging until you move to 2px 2023-10-23 16:20:01 +02:00
Nathan Sobo 239b0c2f71 Clear active state when drag starts 2023-10-23 16:10:04 +02:00
Nathan Sobo 258fcaea94 Position drag handle relative to cursor 2023-10-23 15:20:33 +02:00
Nathan Sobo fc927f7406 Checkpoint 2023-10-23 15:14:10 +02:00
Nathan Sobo d1adce5890 Show red box when dragging 2023-10-23 15:09:22 +02:00
Antonio Scandurra 4e6fb9034d WIP 2023-10-23 14:59:57 +02:00
Nathan Sobo 96f2c4a9de Checkpoint 2023-10-23 14:15:12 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra c0e8ae5dfa WIP 2023-10-23 11:53:24 +02:00
Antonio Scandurra 0de4a93ec7 WIP 2023-10-23 11:43:08 +02:00
Nathan Sobo da8919002f Fix runtime errors 2023-10-23 11:34:35 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00
Antonio Scandurra a0b667a2ca WIP 2023-10-22 19:56:25 +02:00
Antonio Scandurra e7c04d4aca Checkpoint 2023-10-22 18:56:11 +02:00
Antonio Scandurra ce75be91e1 Checkpoint 2023-10-22 18:25:24 +02:00
Antonio Scandurra db6a3e1783 WIP 2023-10-22 18:01:00 +02:00
Antonio Scandurra 7171818d24 WIP 2023-10-22 16:36:29 +02:00
Antonio Scandurra 48033463c8 WIP 2023-10-22 16:33:59 +02:00
Antonio Scandurra 6ffeb048b3 WIP 2023-10-22 16:27:23 +02:00
Antonio Scandurra 5423012368 WIP 2023-10-22 13:15:29 +02:00
Antonio Scandurra f4135e6bcf WIP 2023-10-22 12:21:28 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Antonio Scandurra 2e2825ae98 WIP 2023-10-21 18:41:09 +02:00
Antonio Scandurra 3740c9d852 WIP 2023-10-21 18:33:08 +02:00
Antonio Scandurra 7bb99c9b9c WIP 2023-10-21 18:30:44 +02:00
Antonio Scandurra aa3fb28f81 WIP 2023-10-21 18:21:14 +02:00
Antonio Scandurra b7d30fca2b WIP 2023-10-21 17:52:47 +02:00