yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra f8b5ca8fef Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Petros Amoiridis 15d2d933e2 Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon 
Replace terminal tab title with an icon
 2023-02-23 11:04:43 +02:00
Antonio Scandurra 42bf6ae38b Merge pull request #2200 from zed-industries/fix-slow-project-join 
Hold room lock through the entirety of a `room_transaction`
 2023-02-23 09:11:58 +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
Joseph Lyons 10fc67e57f Fix description of telemetry setting 2023-02-22 23:50:20 -05:00
Max Brunsfeld 29255b8ba7 Run check-formatting CI job on a mac mini 2023-02-22 15:35:05 -08:00
Max Brunsfeld 7e8ff18abe Merge pull request #2203 from zed-industries/collab-ui-fixes 
Fix minor issues with new collab UI
 2023-02-22 14:22:05 -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
Max BrunsfeldandJoseph Lyons f95c7a1a06 Fix ToggleContactsMenu action name in keymap 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2023-02-22 14:17:59 -08:00
Max Brunsfeld c0ac9544ba Bump RPC protocol version number 2023-02-22 13:40:14 -08:00
Max Brunsfeld de2051a89b collab 0.6.0 2023-02-22 12:35:15 -08:00
Max Brunsfeld abcf10d2be v0.76.x dev 2023-02-22 12:34:29 -08:00
Max Brunsfeld e34ff3fdb4 Merge pull request #2114 from zed-industries/new-collaboration-ui 
New collaboration UI part 1/N
 2023-02-22 12:32:41 -08:00
JuliaandMax Brunsfeld f9f5fc38d1 Be more specific about clearing (leader, follower) row 
Previously anyone unfollowing someone would clear all other rows for
other followers leading to an incorrect state, fix and test

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 15:29:20 -05: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
Petros AmoiridisandJulia a098593d23 Add an icon to the terminal view tab 
The terminal icon already existed in `assets/icons`

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:30:44 +02:00
Petros AmoiridisandJulia f6561f0cb7 Deduplicate tab theme related code 
We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.

We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:28:57 +02:00
Petros AmoiridisandJulia 6456971bca Make icon width match other areas 
This was 8 but we've seen areas where this was 14, like the project search tab icon. We want to match this.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:25:39 +02:00
Mikayla Maki d46f091080 Merge pull request #2201 from zed-industries/save-shortcuts 
Add OS UI Keybindings
 2023-02-22 09:16:19 -08:00
Mikayla Maki 36bf325979 Merge pull request #2198 from zed-industries/more-item-defaults 
Add more default impls to the item trait
 2023-02-22 09:14:12 -08:00
Mikayla MakiandAntonio bed59e03f4 Fixed keyboard shortcuts in mac os native panels 
co-authored-by: Antonio <antonio@zed.dev>
 2023-02-22 09:10:16 -08:00
Mikayla MakiandAntonio 40872c8bd4 Introduce an OSAction that can be associated with menu items for mac platform compatibility. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-02-22 09:02:31 -08: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
Max Brunsfeld 9032b8297a Retrieve room id from the project when following/unfollowing 
Previously, we were accidentally using the project id as the room id.
 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
JuliaandAntonio Scandurra 84e1237d45 Add followers table to sqlite scheme for tests 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 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
JuliaandMax Brunsfeld 62ea8909c1 Fix deadlock in db get_room 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 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
Julia bd88f47816 Initial tracking of unfollows on collab server 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra a3d474af23 Begin tracking follow states on collab server 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 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