oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,017 Commits 1 Branch 0 Tags
043cef89eb2bb595d3d3ca3a4ca89aecc740d37f
Commit Graph
251 Commits
Author SHA1 Message Date
Nate ButlerandMarshall Bowers a8bf0834e6 Button2 – Part1 (#3420) 
## TODO

- [x] Remove `InteractionState`
- [ ] `Selectable` should use `Selection` instead of a boolean
- [x] Clean out ui2 prelude
- [ ] Build out button2 button types
- [ ] Port old buttons

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-29 12:23:09 -05:00
Mikayla a41c857855 Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla d927c2f497 Implement all but the UI 2023-11-28 15:18:19 -08:00
Conrad Irwin a761e6ca0e More mouse occlusion work 2023-11-28 09:59:58 -07:00
Conrad Irwin ca0dcf741f Use layers to correct mouse event handling too 2023-11-28 00:07:26 -07:00
Conrad Irwin 107c3d7f67 Fix esc in command palette 
Also: add editor.register_action
 2023-11-27 14:32:22 -07:00
Conrad Irwin 4f885252ab [Zed2] Collab UI (#3403) 
Release Notes:

- N/A
 2023-11-27 12:40:59 -07:00
Conrad Irwin fd165206bf gpui2: Notifications (#3407) 
Release Notes:

- N/A
 2023-11-27 09:22:31 -07:00
Piotr Osiewicz 30af3ffaf3 fixup! Use AppContext instead of AsyncWindowContext to quit 2023-11-27 15:47:00 +01:00
Piotr Osiewicz 44876062c9 Use AppContext instead of AsyncWindowContext to quit 
Fixes refcell-related panic
 2023-11-27 15:44:19 +01:00
Piotr Osiewicz a71180257d Add deafening support 2023-11-27 15:12:13 +01:00
Piotr Osiewicz bf4211b03a Use facepile for avatars 2023-11-27 14:56:51 +01:00
Piotr Osiewicz 4c1514edc4 fixup! Remove shared_screen from workspace 2023-11-27 12:10:07 +01:00
Piotr Osiewicz fad1f8db96 Remove shared_screen from workspace 2023-11-27 12:09:36 +01:00
Conrad Irwin 039c933d8e gpui2: Notifications 2023-11-26 22:28:53 -07:00
Nate Butler 2e61a84bd6 Update tab borders 2023-11-24 16:57:50 -05:00
Piotr Osiewicz 481c19fbaf WIP, frames are being sent to the other end 2023-11-24 17:31:47 +01:00
Nate Butler d965ddba27 Start debugging tab borders 2023-11-24 09:33:44 -05:00
Nate Butler 6a3925c3e1 Add copilot icons 2023-11-24 09:22:31 -05:00
Nate Butler 31565a810d Outline statusbar items 2023-11-24 09:16:19 -05:00
Piotr Osiewicz 6ebe5d5053 Add mute handling 2023-11-24 15:16:03 +01:00
Nate Butler 3c46e81533 More outlines 2023-11-24 09:03:14 -05:00
Nate Butler 7e61d340ce Outline some unfinished elements 2023-11-24 08:58:49 -05:00
Piotr Osiewicz e754c6626d Allow calling an user, render contacts in collab panel 2023-11-23 16:19:25 +01:00
Piotr Osiewicz 390ecb5b0c Merge branch 'main' into collab_ui-zed2 2023-11-23 15:02:55 +01:00
Piotr Osiewicz c191943849 Add basic call/user UI in top-right corner. 
Allow ui::Avatar to take custom data instead of always relying on URI resolution
 2023-11-23 15:00:13 +01:00
Antonio Scandurra 3b918bfee8 Merge branch 'main' into rename-element-traits 
# Conflicts:
#	crates/gpui2/src/elements/uniform_list.rs
#	crates/ui2/src/components/context_menu.rs
#	crates/ui2/src/components/list.rs
 2023-11-23 12:47:46 +01:00
Mikayla 6e84d8fbc0 Merge branch 'main' into panic-hunting 2023-11-22 13:47:17 -08:00
Piotr Osiewicz 6da57cbc6e Decouple workspace from call (#3380) 
This PR decouples `call2` from `workspace2` in order to improve our
compile times.
Why pick such a small, innocent crate as `call`? It depends on
`live_kit_client`, which is not-so-innocent and is in fact stalling our
clean builds.
In this PR, `call2` depends on `workspace2`; workspace crate defines a
`CallHandler` trait for which the implementation resides in `call`; it
it then all tied together in `zed`, which passes a factory of `Box<dyn
CallHandler>` into workspace's `AppState`.
Clean debug build before this change: ~1m45s
Clean debug build after this change: ~1m25s

Clean release build before this change: ~6m30s
Clean release build after this change: ~4m30s

~Gonna follow up with release timings where I expect the change to be
more impactful (as this allows 2/3 of the infamous trio of
"project-workspace-editor" long pole to proceed quicker, without being
blocked on live-kit-client build script)~.
This should have little effect (if any) in incremental scenarios, where
live_kit_client is already built.
[release
timings.zip](https://github.com/zed-industries/zed/files/13431121/release.timings.zip)

Release Notes:
- N/A
 2023-11-22 22:31:47 +01:00
Piotr Osiewicz fa74c49dbb Add dummy call handler for tests 2023-11-22 19:23:58 +01:00
Nathan Sobo c23f17ee0b Reorganize element-related traits 2023-11-22 11:19:43 -07:00
Marshall Bowers 031fca4105 Simplify ContextMenu by not storing list components 2023-11-22 12:41:29 -05:00
Mikaylaandnathan 469b05684f Fix a few identity mixups in GPUI 
co-authored-by: nathan <nathan@zed.dev>
 2023-11-21 17:12:32 -08:00
Piotr Osiewicz 7e7a778d11 Move CallFactory into AppState 
Fix crash caused by double borrow of window handle
 2023-11-21 22:04:02 +01:00
Piotr Osiewicz abe5a9c85f Finish up decoupling workspace from call 2023-11-21 20:51:53 +01:00
Piotr Osiewicz ebccdb64bc Move CallHandler impl into call2 2023-11-21 20:18:35 +01:00
Piotr Osiewicz 170291ff96 Start decoupling workspace and call crates 2023-11-21 19:57:24 +01:00
Nate Butler bec61123fd Update toolbar.rs 2023-11-21 11:06:27 -05:00
Nate Butler 453aa5ffd7 TextColor -> Color 2023-11-21 01:05:29 -05:00
Piotr OsiewiczandMikayla 3e329861f9 Brave new world awaits 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-11-21 00:47:47 +01:00
Piotr Osiewicz 54a3b56935 Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
Conrad Irwin 8049ec674e Fix last thing 2023-11-20 16:35:56 -07:00
MikaylaconradNathan
 		2c4d83c9af WIP 
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
 2023-11-20 14:46:01 -08:00
Piotr Osiewicz d60855b06d Merge branch 'main' into search2 2023-11-20 19:23:35 +01:00
Piotr Osiewicz 3ddfc7ff61 Remove unused import 2023-11-20 18:44:51 +01:00
Piotr Osiewicz 07cc5904f8 Merge branch 'main' into search2 2023-11-20 18:37:41 +01:00
Piotr Osiewicz c1f0ac30a0 Fix up tests once and for good 2023-11-20 18:24:37 +01:00
Conrad Irwin f86480ba5d Merge followup mess 2023-11-20 09:58:05 -07:00
Conrad Irwin 0798cfd58c Merge branch 'main' into derive-element-redux 2023-11-20 09:15:38 -07:00
Nathan Sobo 33cd6f520a Clean compile with redesigned element traits 2023-11-18 21:51:47 -07:00