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 Amoiridis
35524db136
Add a confirmation prompt
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-01-25 18:55:08 +02:00
Petros Amoiridis
db978fcb6c
Add an x mark icon to the list of contacts
...
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-01-25 13:10:29 +02:00
Mikayla Maki
d060114f00
Added complete scripts for generating third party license files
2023-01-23 12:47:12 -08:00
Mikayla Maki
97203e1e02
Fix broken merge
2023-01-20 09:19:58 -08:00
Mikayla Maki
88170df7f0
Switched from active hover to NSViews acceptsFirstMouse API
2023-01-19 15:21:26 -08:00
Mikayla Maki
4eeb1aec50
Adds UI for showing the followed-by status to collaboration
2023-01-19 14:22:12 -08:00
Mikayla Maki
4a46227909
Change incoming call notification to only require one click
2023-01-19 11:43:46 -08:00
Nathan Sobo
3cffee4065
Merge pull request #2011 from zed-industries/project-reconnection
...
Retain connection to remote projects when temporarily disconnected
2023-01-06 18:01:08 -07:00
Kay Simmons
73e7967a12
working f and t bindings
2023-01-06 14:24:20 -08:00
Max Brunsfeld
55ebfe8321
Handle unshared projects when rejoining a room
...
Also, construct remote projects via the room, to guarantee
that the room can manage the projects' sharing lifecycle.
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2022-12-20 11:10:46 -08:00
Max Brunsfeld
70dd586be9
Start work on rejoining rooms, supplying all project info at once
...
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-12-19 17:50:43 -08:00
Max Brunsfeld
ad37034960
Identify LiveKit room participants by user id, not peer id
...
This way, their participant id can remain the same when they reconnect.
2022-12-15 17:19:32 -08:00
Antonio Scandurra
05e99eb67e
Introduce an epoch to ConnectionId and PeerId
2022-12-14 15:55:56 +01:00
Mikayla Maki
925c9e13bb
Remove terminal container view, switch to notify errors
2022-12-08 20:21:00 -08:00
Antonio Scandurra
9a62150dce
Merge branch 'main' into reconnections-2
2022-12-05 19:18:40 +01:00
Mikayla Maki
a1f273278b
Added user notifications
2022-12-03 16:06:02 -08:00
Kay Simmons
1cc3e4820a
working serialized writes with panics on failure. Everything seems to be working
2022-12-03 16:06:01 -08:00
Mikayla Maki
3451a3c7fe
Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :(
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:04:10 -08:00
Antonio Scandurra
40073f6100
Wait for acknowledgment before sending the next project update
2022-11-14 15:32:49 +01:00
Antonio Scandurra
6871bbbc71
Start moving Store state into the database
2022-11-11 12:06:43 +01:00
Antonio Scandurra
0b231e58fd
Show placeholder text for pickers
2022-11-04 10:18:47 +01:00
Nate Butler
6a07f59d34
Merge pull request #1831 from zed-industries/theme-tweaks
...
Theme tweaks
2022-11-02 10:04:55 -04:00
Antonio Scandurra
d275474b23
Don't focus incoming call and project shared notification windows
2022-11-02 14:17:16 +01:00
Mikayla Maki
1820be4990
Adds a little spacing between the share button and the screenshare icon
2022-10-31 10:19:06 -07:00
Nate Butler
9148e1d30a
Update icons
...
- `x_mark_thin` combined into `x_mark`
- updated many icons
- remove unused icons
2022-10-28 12:59:05 -04:00
Antonio Scandurra
5984be3d84
Display call notifications on all screens
2022-10-26 12:05:56 +02:00
Antonio Scandurra
ddc71653ad
Maintain scroll position in contacts list
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-25 18:36:33 +02:00
Antonio Scandurra
f364a15d89
Prevent expanded dock from hiding contacts popover
2022-10-25 13:47:37 +02:00
Antonio Scandurra
2a3773240d
Show a Calling indicator right away when initiating a call
2022-10-25 11:05:57 +02:00
Nathan Sobo
8c2ff69515
Render a tooltip on toggle screen sharing button
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-10-24 09:44:05 -06:00
Antonio Scandurra
7e4d582d1e
Replace Screen Sharing label with Screen
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-24 16:50:56 +02:00
Antonio Scandurra
9860dbbbea
Set location on ActiveCall even before there's a room
...
We will automatically call `Room::set_location` once a room has been
assigned.
2022-10-24 15:07:25 +02:00
Antonio Scandurra
f99d70500c
Allow opening shared screen via the contacts popover
2022-10-24 10:47:47 +02:00
Antonio Scandurra
773f569385
Add control to toggle screen-sharing
2022-10-19 10:19:20 +02:00
Antonio Scandurra
219793afcc
Merge remote-tracking branch 'origin/main' into screen-sharing
2022-10-19 10:04:56 +02:00
Antonio Scandurra
46635956f4
Emit Frame event when new frames are generated for a remote track
2022-10-18 12:18:49 +02:00
Nathan Sobo
12eab6551f
Remove dispatch_event from Element trait
2022-10-16 13:08:25 -06:00
Nathan Sobo
6e363e464c
Start on view-level dispatch approach for keyboard events
2022-10-16 11:46:31 -06:00
Nathan Sobo
bc03592912
Only invalidate parent view on click/hover if we read that state when rendering
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:09:15 -06:00
Antonio Scandurra
a5a60eb854
Log view name alongside error in ChildView
2022-10-13 15:44:01 +02:00
Max Brunsfeld
b5786cbf30
Dismiss contacts popover when clicking outside, even w/o focus change
...
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-12 17:55:11 -07:00
Max Brunsfeld
513c02e67f
Remove spurious focus of contact popover when opening it
...
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-12 17:39:44 -07:00
Max Brunsfeld
89f05ada0b
Allow toggling collaboration menu from the keyboard
2022-10-12 14:14:03 -07:00
Max Brunsfeld
65b8c512fe
Allow opening other local projects via contacts list
2022-10-11 12:37:00 -07:00
Antonio Scandurra
f26695ea8c
💄
2022-10-11 18:34:04 +02:00
Antonio Scandurra
ba6c5441c0
Always show invite link in contacts popover
2022-10-11 18:22:00 +02:00
Antonio Scandurra
f83de0a91c
Respect contacts popover size
2022-10-11 17:30:17 +02:00
Antonio Scandurra
eb711cde53
Polish styling of contacts popover
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-11 16:52:20 +02:00
Antonio Scandurra
4504b36c8f
Show a different message when participant is active on unshared project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-11 15:24:31 +02:00
Antonio Scandurra
feb17c29ec
Show participant projects in contacts popover
2022-10-11 12:23:15 +02:00
Antonio Scandurra
0a306808da
Dismiss project shared notifications when a project was unshared
2022-10-11 11:44:31 +02:00
Antonio Scandurra
9ec62d4c1f
Foreground app when accepting calls and project shares
2022-10-11 11:03:49 +02:00
Antonio Scandurra
bf0a04ab50
Dismiss popover when contact finder is unfocused
2022-10-11 11:01:38 +02:00
Antonio Scandurra
bf488f2027
Show project root names when displaying incoming call notification
2022-10-11 10:59:36 +02:00
Nathan Sobo
e0b6b0df2a
Rename Join button to Open, rework message slightly
2022-10-10 18:12:00 -06:00
Nathan Sobo
b8c2acf0f2
Show worktree root names when sharing additional projects on a call
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-10-10 17:56:03 -06:00
Antonio Scandurra
8dc99d42ff
Remove menu bar extra
2022-10-10 18:21:11 +02:00
Antonio Scandurra
04fcd18c75
Show contacts popover when clicking on menu bar extra
2022-10-10 16:30:02 +02:00
Antonio Scandurra
5f9cedad23
Add margin to picker in contacts popover
2022-10-10 16:05:09 +02:00
Antonio Scandurra
7cfe435e62
Style project shared notifications
2022-10-10 14:37:51 +02:00
Antonio Scandurra
9d990ae329
Show all room participants in titlebar
...
...and allow following them into external projects.
2022-10-10 14:20:45 +02:00
Antonio Scandurra
d7bac3cea6
Style incoming call notification
2022-10-10 11:36:39 +02:00
Antonio Scandurra
79748803a9
Add leave button on active call header
2022-10-10 10:30:51 +02:00
Antonio Scandurra
6f4edf6df5
Move contact finder into contacts popover
2022-10-10 09:56:21 +02:00
Antonio Scandurra
34cb742db1
Set current location after calling another user
2022-10-08 14:47:40 +02:00
Antonio Scandurra
59aaf4ce1b
Call contact on enter
2022-10-08 14:43:41 +02:00
Antonio Scandurra
d14744d02f
Show current user in active call
2022-10-08 14:38:17 +02:00
Antonio Scandurra
f9fb3f78b2
WIP: Render active call in contacts popover
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-07 17:01:48 +02:00
Antonio Scandurra
96c5bb8c39
Fix flicker due to adding and removing menu bar extra unnecessarily
2022-10-07 15:07:09 +02:00
Antonio Scandurra
4aaf3df8c7
Show contact status
2022-10-07 13:56:28 +02:00
Antonio Scandurra
b479c8c8ba
Move project sharing into Room
2022-10-07 10:14:17 +02:00
Antonio Scandurra
9f81699e01
WIP: start on menu bar extra
2022-10-06 16:10:45 +02:00
Antonio Scandurra
c43956d70a
Move contacts panel styles into contacts popover
2022-10-06 14:07:21 +02:00
Antonio Scandurra
40163da679
Move contacts panel features into collab_ui
2022-10-06 14:00:14 +02:00
Antonio Scandurra
7763acbdd5
Move IncomingCall into call crate
2022-10-06 09:52:03 +02:00
Antonio Scandurra
55cc142319
Move incoming calls into ActiveCall
2022-10-06 09:50:26 +02:00
Antonio Scandurra
8f8843711f
Move logic for joining project into a global action in collab_ui
2022-10-05 15:04:03 +02:00
Antonio Scandurra
383c21046f
Set room location when active workspace changes
2022-10-05 15:03:40 +02:00
Antonio Scandurra
84eebbe24a
Always open project when added to a call via the + button
2022-10-05 11:01:28 +02:00
Antonio Scandurra
fceba6814f
Automatically share project when creating the room
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-04 19:25:48 +02:00
Antonio Scandurra
678b013da6
Don't show share button for remote projects
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-04 18:35:54 +02:00
Antonio Scandurra
ebee2168fc
Re-emit notifications and events from ActiveCall
...
This lets us only observe and subscribe to the active call without
needing to track the underlying `Room` if it changes, which implies
writing the same boilerplate over and over.
2022-10-04 18:15:56 +02:00
Antonio Scandurra
41240351d3
Simplify Collaborator to stop including the user
...
It can be retrieved from the `Room` and we're guaranteed to have
a room in order to have collaborators in a project.
2022-10-04 18:00:54 +02:00
Antonio Scandurra
debedaf004
Show notification when a new project is shared and allow joining it
2022-10-04 16:55:41 +02:00
Antonio Scandurra
57930cb88a
Show Share button for unshared projects when inside of a room
2022-10-04 15:56:20 +02:00
Antonio Scandurra
de917c4678
Use a different style for inactive participants
2022-10-04 15:06:20 +02:00
Antonio Scandurra
1898e813f5
Encapsulate Room interaction within ActiveCall
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-29 17:39:53 +02:00
Antonio Scandurra
e0db62173a
Rename room crate to call
...
Also, rename `client::Call` to `client::IncomingCall`.
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-29 17:24:31 +02:00
Antonio Scandurra
1158911560
Wire up accepting/declining a call
2022-09-29 15:33:33 +02:00
Antonio Scandurra
634f9de7e6
Avoid using global for Room and extract that logic into ActiveCall
2022-09-29 10:48:51 +02:00
Antonio Scandurra
46b61feb9a
Open popup window when receiving a call
...
We still need to style and allow people to accept the call but this
is a good starting point.
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 19:35:24 +02:00
Antonio Scandurra
aa3cb8e35e
Rename collab_titlebar_item crate to collab_ui
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 19:14:31 +02:00
