Commit Graph
141 Commits
Author SHA1 Message Date
Julia aae083923c Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Mikayla Maki 1cbe0990e4 Merge pull request #2207 from zed-industries/project-panel-actions
Fix project panel actions
2023-02-23 14:31:29 -08:00
Mikayla Maki 730ea83ee0 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 253a3fc2a1 Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra 482d1b6789 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Antonio Scandurra f8b5ca8fef Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Max Brunsfeld 8a88fe4968 Remove leave button from the title bar 2023-02-22 23:30:32 -08:00
Max Brunsfeld 781ad9501a 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 45f2eebb2d 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 c094ca7b0d Add top level leave call button
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:44:23 -05:00
JuliaandMax Brunsfeld 31a31fb3fa Fiddle with titlebar item spacing
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:13:29 -05:00
JuliaandMax Brunsfeld 3d85c51976 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 57185f02fb Add style leader selection container
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 13:36:06 -05:00
JuliaandMax Brunsfeld 2d1da9e310 Add mockup accurate avatar background
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
JuliaandMax Brunsfeld b7120c3e83 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 b9935a7208 Remove Flex::with_reversed_pain_order 2023-02-22 11:34:55 -05:00
Max Brunsfeld d860521e5a 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 0781cd8112 Remove left side collaborator list
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
JuliaandNathan Sobo f509f4c2a7 Close contacts popover when call ends
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-02-22 11:34:55 -05:00
Julia 19e3a864c5 Make tooltip lie less 2023-02-22 11:34:55 -05:00
JuliaandNathan Sobo fb047a226d 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 3c7ff46f50 Initial adding of contact menu to call-less share button 2023-02-22 11:22:37 -05:00
Julia 221d80a608 Shuffle share/unshare button back to the right side 2023-02-22 11:22:37 -05:00
Julia 8946fbd17d Highlight face pile which local user is following 2023-02-22 11:22:37 -05:00
Julia 21bb7d85a6 Handle case where follower is local user 2023-02-22 11:22:37 -05:00
Julia 7795dc84e9 Add username to right side 2023-02-22 11:22:37 -05:00
Julia 90255cce45 Make things a bit more infallible 2023-02-22 11:22:37 -05:00
Julia fa56590cd7 Following face piles finally take their first breath 2023-02-22 11:21:23 -05:00
Julia 988f9c1266 Abuse a closure instead of abusing options/iterators quite so much 2023-02-22 11:21:23 -05:00
Julia 3d9742d272 Absolute pain of the iterator kind (start laying out a user's followers) 2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis 11c724d5fe 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 6fb45a7366 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 3bca2fdae9 Add collaborators to collaborator list, including self user 2023-02-22 11:21:23 -05:00
Julia ea3bb46d2b Add collaborator count to collaborator list button 2023-02-22 11:21:23 -05:00
Julia 944c6fba5f Switch collaborator list to using own style 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra 084677795d Begin adding collaborator list popover
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Julia e13d10cdb5 Move share button and support unsharing 2023-02-22 11:21:23 -05:00
Julia 9cc7d74f69 Move workspace title into collaboration titlebar item render 2023-02-22 11:21:11 -05:00
Mikayla Maki 6aec385c3f Changed label and text to be generic over static strings and owned strings 2023-02-21 16:47:29 -08:00
Mikayla Maki 5b293afc2d Made the 'update zed to collaborate' button clickable 2023-02-16 14:53:50 -08:00
Kay Simmons 982a702285 fix unsaved change 2023-02-03 12:47:20 -08:00
Kay Simmons b9419d9523 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 5a880fed44 start adding setting for the screen sharing status indicator 2023-01-31 15:17:16 -08:00
Kay Simmons 431a74bb3a Add call status indicator to the status bar 2023-01-31 15:00:49 -08:00
Kay Simmons cf0966d8ea 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 0ecd6845dc better but still broken 2023-01-25 17:05:57 -08:00
Kay Simmons f6d76da812 mostly working now 2023-01-25 11:36:38 -08:00
Kay Simmons 56396af37b wip 2023-01-25 11:32:19 -08:00
Petros Amoiridis abc291b73a 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 3c8c907b18 Add a confirmation prompt
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-01-25 18:55:08 +02:00