zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
10,297 Commits 663 Branches 720 Tags 179 MiB
d8d0bdc479
Commit Graph

266 Commits

Author SHA1 Message Date
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
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
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
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
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
Petros Amoiridis
86ed5b8b83
Position contacts and user menus 
Using the new approach for consistency
 2023-03-17 14:05:46 +02:00
Mikayla Maki
c3325430ca Fix divide by 0 in terminal 
Fix fail to remove contact in contact list
 2023-03-16 12:31:50 -07:00
Max Brunsfeld
0bbb4b22c6 Rename 'Authenticate' action to 'Sign In' 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-14 11:01:23 -07:00
Max Brunsfeld
75901f1c33 Show sign in button directly in titlebar when not signed in 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-14 10:59:39 -07:00
Mikayla Maki
88599add56 Remove UI for invite link in prep for beta launch 2023-03-13 12:54:20 -07:00
Nate Butler
6497ca8ccb Update icon 2023-03-13 13:47:58 -04:00
Antonio Scandurra
bca1acf6d3 Leave room on quit 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-03-13 17:52:10 +01:00
Joseph Lyons
e272a1a18f Switch github_login to String 
One of our macros, `impl_actions!`, didn't like that `RemoveContact` had a lifetime.
 2023-03-12 05:03:31 -04:00
Joseph Lyons
c18f1b6246 Mention username of user in prompt when removing a contact 2023-03-11 19:28:35 -05:00
Mikayla Maki
30a08467b0
Merge pull request #2263 from zed-industries/language-status-bar 
Language status bar
 2023-03-10 16:26:42 -08:00
Mikayla Maki
e45104a1c0 Move feedback to overflow menu and help menu 2023-03-10 12:48:11 -08:00
Mikayla Maki
37d01c7fb3
Merge pull request #2199 from zed-industries/welcome-experience 
Welcome experience
 2023-03-10 10:48:30 -08:00
Antonio Scandurra
221bb54e48 Introduce a new TryFutureExt::unwrap method 2023-03-10 11:41:13 +01:00
Julia
01e3173ed0 Preserve contacts popover editor contents when switching to search mode 2023-03-09 22:05:32 -05:00
Julia
981b3a459f Sort collaborators in titlebar alphabetically instead of by replica id 2023-03-08 21:38:30 -05:00
Mikayla Maki
152755b043 Add blank pane experience 2023-03-08 17:56:39 -08:00
Mikayla Maki
4c179875ab Add png image loading to gpui 
add zed logo into welcome experience

Co-authored-by: Nathan <nathan@zed.dev>
 2023-03-06 14:26:32 -08:00
Julia
465d8cc2ff Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Mikayla Maki
350b7b82f7
Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki
9004640586 Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage 2023-02-23 14:10:55 -08:00
Julia
e1df85e86d Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra
b965333325 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Antonio Scandurra
a0daf47134 Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Max Brunsfeld
65a9ac449f Remove leave button from the title bar 2023-02-22 23:30:32 -08:00
Max Brunsfeld
bf5c3d963a Rearrange collab titlebar items to avoid movement of the toggle contacts button 
* Replace username in titelbar with a `...` user menu that shows
  the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
 2023-02-22 22:56:11 -08:00
Max Brunsfeld
40aee8d7bc Add missing tooltip for contacts menu button 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2023-02-22 14:18:17 -08:00
Julia
36040cd0e1 Add top level leave call button 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:44:23 -05:00
Julia
a07867d628 Fiddle with titlebar item spacing 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:13:29 -05:00
Julia
812145f9ab Only show in-call share/unshare button if own project 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:40:43 -05:00
Julia
dbe5b0205c Add style leader selection container 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:36:06 -05:00
Julia
9b92a8e3fe Add mockup accurate avatar background 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
7f4da80386 Initial dedicated face pile element 
Rather than overload Flex with yet another special case, add a dedicated
element to handle this overlap instead

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
6a731233c5 Remove Flex::with_reversed_pain_order 2023-02-22 11:34:55 -05:00
Max Brunsfeld
b7cf426908 Start work on styling of follower avatars in facepiles 
* Make follower avatars smaller than top-level avatars
* Make avatars in facepiles overlap
* Render an opaque background behind avatars in facepiles.
 2023-02-22 11:34:55 -05:00
Julia
c75aca25b6 Remove left side collaborator list 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
ae87961a77 Close contacts popover when call ends 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
e9464815e0 Make tooltip lie less 2023-02-22 11:34:55 -05:00
Julia
1ed47663ef Avoid moving contacts popover during call start & add button style state 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
dd02bc7748 Initial adding of contact menu to call-less share button 2023-02-22 11:22:37 -05:00
Julia
3105ecd0bd Shuffle share/unshare button back to the right side 2023-02-22 11:22:37 -05:00
Julia
05e9615507 Highlight face pile which local user is following 2023-02-22 11:22:37 -05:00