Commit Graph
141 Commits
Author SHA1 Message Date
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 BrunsfeldandJoseph Lyons 40aee8d7bc Add missing tooltip for contacts menu button
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2023-02-22 14:18:17 -08:00
JuliaandMax Brunsfeld 36040cd0e1 Add top level leave call button
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:44:23 -05:00
JuliaandMax Brunsfeld a07867d628 Fiddle with titlebar item spacing
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:13:29 -05:00
JuliaandMax Brunsfeld 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
JuliaandMax Brunsfeld dbe5b0205c Add style leader selection container
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 13:36:06 -05:00
JuliaandMax Brunsfeld 9b92a8e3fe Add mockup accurate avatar background
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
JuliaandMax Brunsfeld 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
JuliaandMax Brunsfeld c75aca25b6 Remove left side collaborator list
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
JuliaandNathan Sobo 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
JuliaandNathan Sobo 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
Julia 1abb7794cb Handle case where follower is local user 2023-02-22 11:22:37 -05:00
Julia 50e681bbb1 Add username to right side 2023-02-22 11:22:37 -05:00
Julia 3fb8395085 Make things a bit more infallible 2023-02-22 11:22:37 -05:00
Julia 4513c40993 Following face piles finally take their first breath 2023-02-22 11:21:23 -05:00
Julia 33c265d3cf Abuse a closure instead of abusing options/iterators quite so much 2023-02-22 11:21:23 -05:00
Julia 58c41778e7 Absolute pain of the iterator kind (start laying out a user's followers) 2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis 28786a3c18 Add Flex with_reversed_paint_order & initially move face piles to left
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis a5fd0250ab Start fleshing out layout of collaborator list entries
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
Julia 99236f1875 Add collaborators to collaborator list, including self user 2023-02-22 11:21:23 -05:00
Julia bf8658067f Add collaborator count to collaborator list button 2023-02-22 11:21:23 -05:00
Julia c697c1a96a Switch collaborator list to using own style 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra 2b6aa3f5d1 Begin adding collaborator list popover
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Julia e96d52f35a Move share button and support unsharing 2023-02-22 11:21:23 -05:00
Julia ed2f1ddd2d Move workspace title into collaboration titlebar item render 2023-02-22 11:21:11 -05:00
Mikayla Maki b500ed3171 Changed label and text to be generic over static strings and owned strings 2023-02-21 16:47:29 -08:00
Mikayla Maki 4ea7a24b93 Made the 'update zed to collaborate' button clickable 2023-02-16 14:53:50 -08:00
Kay Simmons 3e92e4d110 fix unsaved change 2023-02-03 12:47:20 -08:00
Kay Simmons 303216291b Move sharing status indicator out of the call crate and into collab_ui in order so that the model doesn't depend on the view 2023-02-03 11:17:50 -08:00
Kay Simmons 460dc62888 start adding setting for the screen sharing status indicator 2023-01-31 15:17:16 -08:00
Kay Simmons e35db69dbd Add call status indicator to the status bar 2023-01-31 15:00:49 -08:00
Kay Simmons ea0dd8972f Merge pull request #2090 from zed-industries/workspace-window-position-persistence
Workspace window position persistence
2023-01-27 15:24:01 -08:00
Kay Simmons a369fb8033 better but still broken 2023-01-25 17:05:57 -08:00
Kay Simmons 5eac797a93 mostly working now 2023-01-25 11:36:38 -08:00
Kay Simmons 15799f7af6 wip 2023-01-25 11:32:19 -08:00
Petros Amoiridis 160870c9de Improve user notification
The message is not really true. When one declines, the other person can notice that the contact request  is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
2023-01-25 19:46:51 +02:00
Petros AmoiridisandAntonio Scandurra 35524db136 Add a confirmation prompt
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-01-25 18:55:08 +02:00