zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
11,379 Commits 667 Branches 720 Tags 178 MiB
2a182b6a7b
Commit Graph

407 Commits

Author SHA1 Message Date
Piotr Osiewicz
3318896ad9 Display key bind of a modal project picker 2023-07-10 14:29:30 +02:00
Piotr Osiewicz
6e24ded2bc
collab_ui: Add tooltip to branches popover (#2695) 
Z-2554

Release Notes:

- N/A
 2023-07-10 14:20:12 +02:00
Piotr Osiewicz
d69b07bafd Add tooltip to recent projects button 
Z-2545
 2023-07-07 16:30:19 +02:00
Piotr Osiewicz
b80281e556 cargo fmt 2023-07-05 18:57:06 +02:00
Nate Butler
1baa13561d Update project & git menus to be Toggleable<Interactive<ContainedText>> 
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
 2023-07-05 12:50:56 -04:00
Piotr Osiewicz
ec47464bba branch_list: Show match count on the right hand side of a header. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-07-05 16:56:08 +02:00
Piotr Osiewicz
8b3b1a6074 fixup! Remove stacks from branch list header 2023-07-05 14:08:21 +02:00
Piotr Osiewicz
64b77bfa8d Remove stacks from branch list header 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-07-05 14:04:16 +02:00
Piotr Osiewicz
48371ab8b2 Remove PickerEvent::Dismiss emission from picker header 2023-07-04 16:30:17 +02:00
Piotr Osiewicz
e9b34de7c8 Fix click behaviour of vcs/project dropdowns 2023-07-04 16:00:59 +02:00
Piotr Osiewicz
14eab4e94f branch list: dismiss correct window on PickerEvent. 
Query proper window
 2023-07-03 19:22:43 +02:00
Piotr Osiewicz
4eedc3e646 Remove flex from underneath the pickers 2023-07-03 16:16:14 +02:00
Piotr Osiewicz
026ad191eb Dismiss dropdowns on click out 2023-07-01 01:49:00 +02:00
Piotr Osiewicz
525521eeb3 Render match count next to branch label 2023-07-01 01:38:36 +02:00
Piotr Osiewicz
cec884b5a5 Add styles for project name/git menu 2023-06-30 20:07:44 +02:00
Piotr Osiewicz
a5d9a10d7b Focus dropdowns on open 2023-06-30 19:48:28 +02:00
Piotr Osiewicz
ed75c31640 Improve styling of git menu 2023-06-30 16:38:38 +02:00
Piotr Osiewicz
b699e5c142 Add styles to git menu 2023-06-30 16:23:27 +02:00
Piotr Osiewicz
3be8977ee8 Switch branches within spawn() 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
c1a6292152 Add missing call to cx.notify 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
081e340d26 Do not query db on foreground thread. 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
818ddbc703 Make project dropdown exclusive wrt git menu 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
888d3b3fd6 Project dropdown menu 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
d000ea9739 Fix warning about unused variable 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
1eb0f3d091 Update toast for checkout failure 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
98f71a7fa3 Trail off project/branch name 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
e57364ede6 Remove unnecessary imports 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
aeafa6f6d6 Fix build after rebase 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
c84f3b3bfc Add toast for git checkout failure 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
54fad5969f List recent branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
3027e4729a Add timestamps to branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
6747acbb84 Trail off branch names 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
ac6e9c88e9 Render header and footer of git menu 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
d8d0bdc479 WIP: git menu 2023-06-30 14:05:55 +02:00
Mikayla Maki
5366631173
Remove on_click_out handler from context menu 
Add 'delay_cancel()' method and on_down handler to relevant buttons
 2023-06-29 17:10:51 -07:00
Mikayla Maki
cb782c5a7b
Remove menu tracking state 2023-06-28 09:06:06 -07:00
Mikayla Maki
88b30dea10
fmt 2023-06-28 08:44:17 -07:00
Mikayla Maki
9ab0efa1f8
Fix microphone and speaking styles 2023-06-28 08:41:31 -07:00
Piotr Osiewicz
49ce1977e3 Optimize user menu trigger 2023-06-28 15:27:38 +02:00
Piotr Osiewicz
c2f5855fdc Fix warning 2023-06-28 15:22:17 +02:00
Piotr Osiewicz
456be1f86e Hide user menu on second click 2023-06-28 15:19:32 +02:00
Mikayla Maki
749f60ba81
fmt 2023-06-27 19:25:46 -07:00
Mikayla Maki
5d02b49058
Added muted and currently speaking tracking 2023-06-27 19:23:13 -07:00
Nate Butler
8b2732c3aa workspace.titlebar -> titlebar in Theme 2023-06-27 17:27:58 -04:00
Mikayla Maki
19ca6a8875
Seperate online and offline 2023-06-27 13:33:04 -07:00
Nate Butler
825a7cb799 Update screenshare toggle, titlebar spacing 2023-06-27 16:20:45 -04:00
Mikayla Maki
37cb202c93
Rename and toggle screenshare 2023-06-27 09:58:01 -07:00
Piotr Osiewicz
71c0b7d74d Add styles for user menu 2023-06-27 11:55:06 +02:00
Piotr Osiewicz
4b52ff65c1 Add styles for button 2023-06-23 13:30:40 +02:00
Piotr Osiewicz
62786cd508 Add button 2023-06-23 13:15:25 +02:00
Piotr Osiewicz
437e41f99d Add styles for microphone and speakers buttons 2023-06-23 11:52:06 +02:00
Piotr Osiewicz
f774dbfe2e Use new icons, delete old ones 2023-06-22 18:58:11 +02:00
Piotr Osiewicz
18c4d43ee7 Add deafen button 2023-06-22 18:51:26 +02:00
Nate Butler
1a0b2bfef8 Update stream control icons 2023-06-22 12:21:59 -04:00
Piotr Osiewicz
b16b6dcec7 Render microphone toggle 2023-06-22 17:40:29 +02:00
Piotr Osiewicz
bee6c59154 Add caret next to user avatar 2023-06-22 16:28:05 +02:00
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 Maki
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 Maki
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 Amoiridis
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 Amoiridis
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
Antonio Scandurra
c04cb0286a Remove Dismiss and RespondToContactRequest internal actions 2023-04-28 15:56:41 +02:00
Antonio Scandurra
0469e25de6 Remove LeaveCall internal action 2023-04-28 14:14:25 +02:00
Antonio Scandurra
3763b985e3 Fix panic due to re-entrantly reading Workspace 2023-04-28 12:36:50 +02:00
Antonio Scandurra
5215adbd3f Remove ToggleExpanded and Call internal actions 2023-04-28 12:26:47 +02:00
Antonio Scandurra
5d8fcceee3 Remove RespondToCall internal action 2023-04-28 12:24:07 +02:00
Antonio Scandurra
71a4bc7905 Remove OpenSharedScreen internal action 2023-04-28 12:09:34 +02:00
Antonio Scandurra
d953729233 Remove JoinProject internal action 2023-04-28 11:22:04 +02:00
Antonio Scandurra
f881f9e3d8 Remove ToggleFollow internal action 2023-04-28 10:07:44 +02:00
Antonio Scandurra
5521ff1b22 Allow passing a handler function to context menu items 2023-04-27 11:32:12 +02:00
Antonio Scandurra
6317e885c7 Don't allow strong view handles to be read/updated with an AsyncAppContext 
This avoids an invitation to hold strong view handles across async await
points, which is a common source of leaks.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-26 13:36:13 +02:00
Antonio Scandurra
94c2eaad23 Replace ViewContext::spawn with ViewContext::spawn_weak 2023-04-26 10:23:27 +02:00
Max Brunsfeld
ebbe52e6b0 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Max Brunsfeld
abdccf7393 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Nathan Sobo
fe492eacbf Refine naming of element-related types and traits 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-21 13:06:37 -06:00
Antonio Scandurra
03619dfa55 Rename Drawable::boxed to into_element and make containers generic 
Multi-element are now generic over any drawable child, which can be converted
into an element.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-21 12:43:19 -06:00
Antonio Scandurra
8c7f821d14 Introduce a new WindowContext::remove_window API 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-21 16:39:53 +02:00
Nathan Sobo
d70644618a WIP: Make PickerDelegate a fully owned object instead of a view 
This avoids issues with the parent view being on the stack when we want to
interact with the delegate from the picker. Still have several picker usages
to convert.
 2023-04-19 22:05:29 -06:00
Antonio Scandurra
136e599051 Merge branch 'main' into window_context_2 2023-04-18 17:29:37 +02:00
Antonio Scandurra
d03c431f9a Fix warnings/errors now that AsyncAppContext::update returns Result 2023-04-18 14:58:57 +02:00
Julia
14ef0edd7f Don't have contacts popover affect appearance of Share/Unshare button 2023-04-17 14:13:28 -04:00
Julia
61f4f8aaeb Unconditionally display followers in full color 2023-04-17 13:10:40 -04:00
Antonio Scandurra
33bc47dbe2 Merge branch 'main' into window_context_2 2023-04-14 12:07:09 +02:00
Antonio Scandurra
0269a8699b Start removing some warnings 2023-04-13 12:04:37 +02:00
Nathan Sobo
a25f962185 WIP 2023-04-12 12:13:35 -06:00
Nathan Sobo
40896352ff wip 2023-04-12 10:28:53 -06:00
Nathan Sobo
868301bedb WIP 2023-04-12 10:07:17 -06:00
Antonio Scandurra
83070a19c4 WIP 2023-04-12 15:55:43 +02:00
Nathan Sobo
e115baa60c WIP 2023-04-11 18:21:56 -06:00
Joseph Lyons
ae930bde87 Flip screen sharing icon states 2023-04-11 15:30:44 -04:00
Nathan Sobo
2615a11f7c Don't export platform::* from gpui 
I'd like to avoid cluttering the top-level namespace with all the platform-
specific types.
 2023-04-07 11:45:53 -06:00
Nathan Sobo
8136d8a8a6 Fix formatting 2023-04-06 15:54:44 -06:00
Nathan Sobo
de9bf6dfbd Merge MutableAppContext into AppContext 
There may have been a good reason for the difference at some point, or I was
still learning Rust. But now it's just &mut AppContext vs &AppContext.
 2023-04-06 15:49:03 -06:00
Nathan Sobo
82a713fd1d Store AnyViewHandle inside ViewHandle and Deref to it 2023-04-02 14:59:55 -06:00
Mikayla Maki
cc7c5b416c Add status bar icon reflecting copilot state to Zed status bar 2023-03-29 21:31:33 -07:00
Antonio Scandurra
5471217089 Use the same serde version across the entire workspace 2023-03-28 09:42:00 -07:00
Max Brunsfeld
027def6800 Merge branch 'main' into lsp-file-change-notifications 2023-03-24 08:52:43 -07:00
Mikayla Maki
bb5c2833a3 Aligned title bar items to the center and fixed left spacing on the sign in button 
co-authored-by: max <max@zed.dev>
 2023-03-23 13:08:31 -07:00
Antonio Scandurra
7df798ded5 Remove screen sharing indicator when call ends 
Previously, we would only remove it when the screen sharing stopped.
 2023-03-22 09:32:27 +01:00
Max Brunsfeld
cbeb6e692d Move postage crate version specification to workspace Cargo.toml 2023-03-21 11:26:13 -07:00
Petros Amoiridis
98ae69a61f
Merge pull request #2282 from zed-industries/petros/z-283-make-pop-up-positioning-consistent 
Consistent pop-up menu positions
 2023-03-20 17:55:40 +02:00
Nathan Sobo
d429ce0f62
Merge pull request #2308 from zed-industries/feedback-icon 
Use an envelope as the feedback icon so we can use the speech bubble for discussions
 2023-03-20 09:14:34 -06:00
Nathan Sobo
10e6c5b651 Use an envelope as the feedback icon 
This makes room to use the speech bubble for discussion threads.
 2023-03-20 09:04:30 -06:00
Antonio Scandurra
1af8f4be19 Deserialize Theme directly into the heap to avoid stack overflow 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-03-17 15:58:52 +01:00
Petros Amoiridis
86ed5b8b83
Position contacts and user menus 
Using the new approach for consistency
 2023-03-17 14:05:46 +02:00