yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,023 Commits 5 Branches 0 Tags
ea579ebcb71bfbcd2a5a1eda4fa00aab29439a5c
Commit Graph
67 Commits
Author SHA1 Message Date
Marshall Bowers f9701564ce Merge branch 'main' into import-theme 2023-11-03 15:41:12 -04: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
Marshall Bowers b0d3bdb08e Update color names in workspace2 2023-11-03 10:16:34 -04: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 IrwinandAntonio 38c49ea4a7 Render status bar 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 11:18:11 -06:00
Conrad IrwinandAntonio 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 IrwinandMikayla 6605085a27 Render titlebar 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-11-02 10:31:18 -06:00
Conrad IrwinandAntonio 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
Antonio Scandurra f64260f82a WIP 2023-11-02 13:58:42 +01:00
Antonio Scandurra 29bd56f879 Implement WindowContext::remove_window 2023-11-02 13:37:55 +01:00
Antonio Scandurra ce4c87198d Implement AppState::test 2023-11-02 13:34:21 +01:00
Antonio Scandurra 89ba26eab3 Checkpoint 2023-11-02 11:05:24 +01:00
Mikayla eb82028b76 Finish main merge 2023-11-01 11:52:14 -07:00
Mikayla 432f10621c WIP 2023-11-01 11:45:31 -07:00
Antonio Scandurra 216eac9e5e WIP 2023-11-01 18:34:51 +01:00
Antonio Scandurra acf3e89ba7 WIP 2023-11-01 17:21:58 +01:00
Antonio Scandurra 26d0f11f23 WIP 2023-11-01 16:24:19 +01:00
Kirill Bulatov 1393f33c56 WIP 2023-11-01 16:10:07 +02:00
Kirill Bulatov 0bb1b28bd5 WIP 2023-11-01 15:37:51 +02:00
Kirill Bulatov 880f5f278b WIP 
Uncomment more methods in workspace2.rs
 2023-11-01 14:47:29 +02:00
Antonio Scandurra b016be65fb WIP 2023-11-01 12:47:19 +01:00
Nathan Sobo 3a939de217 WIP 2023-10-31 22:32:18 -06:00
Nathan Sobo 2c092ec44d Remove one todo from the critical path 2023-10-31 21:19:32 -06:00
Nathan Sobo b520adfc1a WIP 2023-10-31 16:15:30 -06:00
Nathan Sobo a8afca8ad8 Checkpoint 2023-10-31 11:16:08 -06:00
Nathan Sobo 80996e6b64 WIP 2023-10-31 11:03:01 -06:00
KCaverly 8dcbe21096 wip 2023-10-31 12:00:45 -04:00
KCaverly db2190a3fc Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
KCaverly 52a4261de9 wip 2023-10-31 11:32:56 -04:00