oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,362 Commits 1 Branch 0 Tags
cd818f580cc40aefeeeeb1d7b405723760351fa9
Commit Graph
315 Commits
Author SHA1 Message Date
Max Brunsfeld 6bbb1642b8 Fix propagation of active item to followers 
Enable channel buffer integration tests.
 2023-12-06 12:18:48 -08:00
Antonio ScandurraandMarshall cc9eff89f5 Use a handler instead of an action for clicks 
This prevents dispatching actions on buttons that were not the target of the click.

Co-Authored-By: Marshall <marshall@zed.dev>
 2023-12-06 19:12:01 +01:00
Antonio Scandurra 5f172a52a4 Load assistant panel 2023-12-06 14:23:05 +01:00
Antonio Scandurra 9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Nathan SoboandMarshall 65bb05af4c Merge main 
Co-Authored-By: Marshall <marshall@zed.dev>
 2023-12-05 16:47:13 -07:00
Max Brunsfeld 5b6fd3ac1d Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -08:00
Max Brunsfeld 863222edc5 Get following working 
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
 2023-12-05 12:57:23 -08:00
Marshall Bowers e0ca7f844a Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Nate ButlerandMarshall Bowers dc7e4a4b17 Remove debugging colors 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:09:29 -05:00
Nate ButlerandMarshall Bowers 27703a3279 Update tabs rendering, fix tab spacing bug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:04:12 -05:00
Nate Butler eed5a698cf Update tab close button 2023-12-05 11:59:23 -05:00
Antonio Scandurra ede86d9187 WIP 2023-12-05 16:49:36 +01:00
Nate Butler 7c5df51d2e Update button sizes 2023-12-05 10:11:18 -05:00
Antonio Scandurra 30725d6a17 Port semantic_index to gpui2 (#3500) 
Release Notes:

- N/A
 2023-12-05 15:52:38 +01:00
Antonio ScandurraandJulia Risley 09db455db2 Port semantic_index to gpui2 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-12-05 15:38:36 +01:00
Kirill Bulatov 16b5d4b35c Port to gpui2 2023-12-05 16:13:39 +02:00
Nate Butler af72772a72 Expand toolbar tools 2023-12-05 09:02:21 -05:00
Max Brunsfeld ae6ddceb67 Enable more collab UI features (#3496) 
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
 2023-12-04 18:01:11 -08:00
Max BrunsfeldandNathan eff3a72fb5 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Nate Butler 591dc9d82a Remove double first item border in tabs 2023-12-04 20:13:52 -05:00
Max BrunsfeldandNathan 71a1125e88 Allow joining remote projects in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:06:08 -08:00
Max Brunsfeld 959b2961ff Revert "Decouple workspace from call (#3380)" 
This reverts commit 6da57cbc6e, reversing
changes made to 62b1843704.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00
Max BrunsfeldandNathan 63667ecf6f Start bringing back the current call section of the collab panel 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Conrad Irwin 1c9b984738 Remove cx param 2023-12-04 23:35:31 +00:00
Nate Butler 7db0a9e105 Draw border under tabs 2023-12-04 18:21:50 -05:00
Nate Butler fc16e4509a Fix double border 2023-12-04 18:13:28 -05:00
Nate Butler 5bdaf0e074 Work on light theme, update tab 2023-12-04 17:54:37 -05:00
Nate ButlerandMarshall Bowers b6ed3b258c Remove debug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:32:14 -05:00
Nate Butler 0af0c5549c Update toolbar left tool group 2023-12-04 11:14:59 -05:00
Nate Butler 7dc22fef24 Prevent tab bar from growing in height when a tab is added 2023-12-04 09:24:08 -05:00
Nate Butler 11c16258eb Update empty pane state 2023-12-04 09:13:00 -05:00
Conrad Irwin 1da18ebe9a copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6426997abb Prevent languages showing in wrong order first 2023-12-01 21:26:23 -07:00
Conrad Irwin 6a5b5f022d Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Nathan SoboandMax 0edd89a92f Bind CloseWindow and Open actions on workspace 
Co-Authored-By: Max <max@zed.dev>
 2023-12-01 16:17:48 -07:00
Nathan Sobo 6f7995c150 Enable workspace::Open global action 2023-12-01 16:08:57 -07:00
Julia 6f9e08ceea Merge branch 'main' into zed2-breadcrumbs 2023-12-01 12:28:36 -05:00
Julia 910aeb4f56 I'm a dunce 2023-12-01 11:47:04 -05:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Nate Butler 88188b0c30 Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00
Julia ce16e5b54a Unbreak toolbar layout & improve disabling ButtonLike 2023-12-01 10:33:44 -05:00
Antonio Scandurra 1abc876c15 Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor 
# Conflicts:
#	crates/editor2/src/items.rs
 2023-12-01 12:40:48 +01:00
Antonio Scandurra 8e4f2fb25a Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Antonio Scandurra c9be637b6b Re-introduce auto-height in editor2 (#3471) 
Release Notes:

- N/A
 2023-12-01 12:02:45 +01:00
Antonio Scandurra 21d3ae603d Remove stray dbg statements 2023-12-01 11:49:25 +01:00
Conrad Irwin 0441b4805a Show cursor position in status bar (#3464) 
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
 2023-11-30 16:40:42 -07:00
Conrad Irwin e1c8369b3d Rename menu_handle to right_click_menu and child to trigger 
This makes things more in-line with `popover_menu`.
 2023-11-30 16:39:43 -07:00
Max Brunsfeld cb11c1282c Re-introduce active path tracking in workspace 2023-11-30 14:58:14 -08:00
Max Brunsfeld a003a91212 Restore auto-save on focus change, re-enable workspace tests 2023-11-30 14:45:27 -08:00
Max Brunsfeld c63ca09eed Reintroduce pane navigation history in zed2 2023-11-30 12:10:25 -08:00