oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,988 Commits 1 Branch 0 Tags
bf80c1da5bb7405008f73596a270c539d0e41a94
Commit Graph
66 Commits
Author SHA1 Message Date
Marshall BowersNate ButlerMarshall Bowers
 		bf80c1da5b Rename fields in ThemeColors (#3242) 
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.

This will help prevent this branch from diverging too far from `main`.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-06 11:53:27 -05:00
Kyle Caverly 343525d77b added workspace event for WorkspaceCreated (#3222) 
added workspace2 event for WorkspaceCreated

Release Notes:

- NA
 2023-11-03 11:06:11 -04:00
Antonio Scandurra 097171b9b8 Merge remote-tracking branch 'origin/main' into editor2 2023-11-03 14:47:49 +01:00
Antonio Scandurra 3e8fcefaef Remove more todos 2023-11-03 14:42:26 +01:00
KCaverly b148c61047 added workspace event for WorkspaceCreated 2023-11-03 08:52:18 -04:00
Kirill Bulatov 1a0cd3e09b Remove and add more todosmerge . 2023-11-03 13:22:11 +02:00
Antonio Scandurra 77e3c7f8ee WIP 2023-11-03 12:10:15 +01:00
Kirill Bulatov eb8a0e7148 Uncomment persistence tests 2023-11-03 12:38:09 +02:00
Antonio Scandurra b7712c2f4b Fix a todo in workspace 2023-11-03 11:36:39 +01:00
Antonio Scandurra 6fc7b17259 Expose a focus handle from workspace::Item 2023-11-03 11:00:57 +01:00
Antonio Scandurra efa27cf9b8 Uncomment more editor code 2023-11-03 10:09:00 +01:00
Antonio Scandurra cdc82d01f7 Call editor::init 2023-11-03 09:06:25 +01:00
Nathan Sobo f3b8a9d8c2 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo dfc7c81500 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 2a12e8f307 Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06:00
Conrad Irwin 583c36e24b WIP 2023-11-02 15:27:49 -06: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 8283909dfd Disable selective warnings to make cargo check happy 2023-11-02 13:28:58 -06:00
Conrad Irwin 269a72464d Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Marshall Bowers 9c8220d04e Remove commented-out label code 2023-11-02 15:04:52 -04:00
Marshall Bowers 3605afc163 Render active item in pane 2023-11-02 14:40:34 -04:00
Marshall Bowers 8b1b7a2f80 Checkpoint: Basic tab bar structure 2023-11-02 14:34:48 -04:00
Conrad Irwin 5a41eed120 WIP 2023-11-02 11:34:31 -06:00
Conrad IrwinandAntonio 8f0f5a9ba1 Render status bar 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 11:18:11 -06:00
Conrad IrwinandAntonio 803d2b6710 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 bd54bfa4e1 Render titlebar 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-11-02 10:31:18 -06:00
Conrad IrwinandAntonio 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 52e195b47c WIP 2023-11-02 07:46:49 -06:00
Antonio Scandurra d4e199cab1 WIP 2023-11-02 13:58:42 +01:00
Antonio Scandurra c1ca7ad41d Implement WindowContext::remove_window 2023-11-02 13:37:55 +01:00
Antonio Scandurra 089bf58934 Implement AppState::test 2023-11-02 13:34:21 +01:00
Antonio Scandurra 32dded551c Checkpoint 2023-11-02 11:05:24 +01:00
Mikayla 6f38eb3252 Finish main merge 2023-11-01 11:52:14 -07:00
Mikayla 1c1b53ecf6 WIP 2023-11-01 11:45:31 -07:00
Antonio Scandurra 337a79e35f WIP 2023-11-01 18:34:51 +01:00
Antonio Scandurra c3a8bab4d2 WIP 2023-11-01 17:21:58 +01:00
Antonio Scandurra 147db607c7 WIP 2023-11-01 16:24:19 +01:00
Kirill Bulatov e8857d959b WIP 2023-11-01 16:10:07 +02:00
Kirill Bulatov a9d7c86307 WIP 2023-11-01 15:37:51 +02:00
Kirill Bulatov 73c97d0c10 WIP 
Uncomment more methods in workspace2.rs
 2023-11-01 14:47:29 +02:00
Antonio Scandurra 4d320f065e WIP 2023-11-01 12:47:19 +01:00
Nathan Sobo d47ef6470b WIP 2023-10-31 22:32:18 -06:00
Nathan Sobo 4da8ee1e1d Remove one todo from the critical path 2023-10-31 21:19:32 -06:00
Nathan Sobo 0ecf6bde73 WIP 2023-10-31 16:15:30 -06:00
Nathan Sobo 90601fe4fd Checkpoint 2023-10-31 11:16:08 -06:00
Nathan Sobo 0a2fde8707 WIP 2023-10-31 11:03:01 -06:00
KCaverly fed391fe6b wip 2023-10-31 12:00:45 -04:00
KCaverly 551171a339 Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
KCaverly 68a1c7ce4c wip 2023-10-31 11:32:56 -04:00
KCaverlyandKirill 5550e80c4e workspace2 is compiling 
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-31 11:14:43 -04:00