oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,934 Commits 1 Branch 0 Tags
bdccdaca1c679dcd3bd8cdedf17d65cce8d77fe4
Commit Graph
243 Commits
Author SHA1 Message Date
Piotr Osiewicz bdccdaca1c Remove unused variable 2023-06-22 13:57:41 +02:00
Piotr Osiewicz 4583d22ede cargo fmt 2023-06-22 13:49:36 +02:00
Piotr Osiewicz 76366422a6 Merge branch 'main' into collab-titlebar-2 2023-06-22 13:48:16 +02:00
Mikayla Makiandantonio 5ffe74f47e Fix race condition in sharing mic on connection 
co-authored-by: antonio <antonio@zed.dev>
 2023-06-21 08:50:38 -07:00
Piotr Osiewicz 31c1177737 Adjust some of the styles to the new Toggleable format 2023-06-20 16:05:23 -07:00
Piotr Osiewicz 0256f89dd6 Rename on/off states to active/inactive 2023-06-20 16:05:23 -07:00
Piotr Osiewicz e92015b12f Split out Interactive<T> into Toggle<T> and Interactive<T> 2023-06-20 16:05:20 -07:00
Mikayla Maki cf4251fb55 Fix deafened -> enabled mistranslation 
Fix mislocation of caller query in detach_and_log_error
Fix incorrect wording on livekit integration
Add share_mic action for manually enabling the microphone
Make mic sharing wait until the room has been fully established
 2023-06-20 15:17:49 -07:00
Mikayla Maki dbd95e35cf fmt 2023-06-20 12:36:36 -07:00
Mikayla Maki b828a74ad6 Add deafen controls 2023-06-20 12:34:32 -07:00
Mikayla Maki e58f0ac72f Add mute toggling controls 2023-06-20 09:35:57 -07:00
Piotr Osiewicz 3e3079b513 cargo fmt 2023-06-19 12:07:02 +02:00
Piotr Osiewicz 91f2f31daa Split git/project label into a flex row 2023-06-19 12:06:42 +02:00
Mikayla Maki ecd2129c2f Add deafen and mute stubs 2023-06-16 11:16:36 -07:00
Mikayla Maki dedc117cca Add audio APIs to Zed 
Share mic on joining room
 2023-06-16 10:13:27 -07:00
Piotr Osiewicz ae68be64c0 Move share button to the right hand side 2023-06-15 22:05:43 -07:00
Piotr Osiewicz d079a0eb20 Render user avatar only if an user is not in a call 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 83c1bb07bb Add background to user avatar 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 433c5d30f5 Add Sign in button for an unregistered user 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 092cf93dae Move zed actions to zed-actions 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 0fe65b945f Remove user avatar from dropdown menu 
Add new options in context menu
 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 5f7fdd25eb Fix compile error (use of moved value) 2023-06-15 22:05:43 -07:00
Mikayla Maki 47ef800dc6 WIP: Add face to right hand menu 2023-06-15 22:05:43 -07:00
Joseph Lyons 7c60f636d5 Fix typos 2023-06-02 22:02:19 -04:00
Antonio Scandurra 146809eef0 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Antonio Scandurra 5a8fb18c20 Show workspace only after initializing it 2023-05-19 19:35:00 +02:00
Max Brunsfeld 2d5f03e148 Remove optional path argument when getting settings 2023-05-17 15:05:20 -07:00
Max Brunsfeld 67a25126d4 Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld 6403bb86e1 Define workspace settings in workspace crate 2023-05-16 20:25:18 -07:00
Mikayla Maki f28419cfd1 Fix styling of titlebar highlights 2023-05-08 14:33:59 -07:00
Mikayla Maki 15d2f19b4a fix format 2023-05-08 14:33:59 -07:00
Mikayla Maki d2279674a7 Fix panic in tests 2023-05-08 14:33:59 -07:00
Mikayla Maki f9e4464658 Refresh titlebar on project notifications 2023-05-08 14:33:59 -07:00
Mikayla Maki 53569ece03 WIP: Change RepositoryEntry representation to be keyed off of the work directory 
Removes branches button scaffolding
 2023-05-08 14:33:59 -07:00
Mikayla MakiandPetros 8bde496e74 Add branch name in title UI 
co-authored-by: Petros <petros@zed.dev>
 2023-05-08 14:33:59 -07:00
Petros Amoiridis 5302c256a4 Rebase main and fix error 2023-05-08 14:33:59 -07:00
Petros Amoiridis ca4da52e39 Remove unused functions 2023-05-08 14:33:59 -07:00
Petros AmoiridisandMikayla Maki e057b0193f Introduce BrancesButton in title bar 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-05-08 14:33:58 -07:00
Petros Amoiridis 797d47a08c Render title root names without branches 2023-05-08 14:33:58 -07:00
Mikayla Maki 8f0aa3c6d9 Add branch name into title 2023-05-08 14:33:58 -07:00
Petros AmoiridisandMikayla Maki d34ec462f8 Display branch information per worktree root 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-05-08 14:33:58 -07:00
Antonio Scandurra da19edc3e3 Merge branch 'main' into implicit-ancestry 2023-05-04 14:39:58 +02:00
Antonio Scandurra 3d679ddb26 Avoid re-allocating KeymapContext after every view notification 2023-05-04 12:04:30 +02:00
Antonio Scandurra e9ed40da37 Remove the ability to retrieve the view's parent 2023-05-03 16:52:55 +02:00
Antonio Scandurra 7f345f8bf5 Separate Window::build_scene into layout and paint 2023-05-03 12:18:16 +02:00
Antonio Scandurra 376aa1235f Fix "IncomingCallNotification was dropped" error when accepting a call 
This was caused by accepting the call, which caused the notification to
be removed. When `active_call.accept_incoming()` finally completed, we
would try to get the app state from it in order to join the project, but
couldn't becuase the view would have already been dropped.

This commit fixes the bug by capturing a weak handle to the app state
when accepting the call as opposed to trying to read it from the view
when the accept completes.
 2023-05-03 10:37:57 +02:00
Antonio Scandurra 70f8cf4cf6 Move methods querying window state into AsyncAppContext 2023-05-02 19:38:48 +02:00
Antonio Scandurra 94f1775533 Fix broken styling in contact finder 
This regressed as part of #2372, where we forgot to theme the contact
finder picker differently from the rest of the app.
 2023-05-02 13:46:49 +02:00
Antonio Scandurra f985fac6f9 Fix panic when showing contacts popover via keybinding 2023-05-02 11:47:05 +02:00
Antonio Scandurra c4472b0786 Remove ViewContext::dispatch_action 2023-05-01 16:27:36 +02:00