mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 16:37:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
12114 commits 698 branches 747 tags 259 MiB
Commit graph

464 commits

Author SHA1 Message Date
Mikayla
4eff8ad186
Add channel notes view 
co-authored-by: Max <max@zed.dev>
 2023-08-23 18:37:00 -07:00
Mikayla
a7a4e2e369
Add buffer integration test 
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Mikayla
707ca34f19
Merge branch 'main' into disclosable-component 2023-08-23 16:30:27 -07:00
Mikayla
2a182b6a7b
Tune styles and disclosable elements 2023-08-23 16:25:40 -07:00
Nathan Sobo
d375f7992d Merge branch 'main' into divs 2023-08-22 16:35:56 -06:00
Joseph T. Lyons
f66e6863fa Add channel id to call events 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-21 13:50:04 -04:00
Mikayla
e946b0a2ec
Finish building out adapters and names 
Document core traits
Add start for a component storybook
 2023-08-19 14:40:05 -07:00
Mikayla
bd3ab82dac
Add disclosable components into channels 
Rename components to more closely match their purpose
 2023-08-19 05:18:53 -07:00
Mikayla
2d37128693
Actually get it compiling, omg 2023-08-18 19:02:27 -07:00
Mikayla
3178adefde
WIP: Add disclosable channels 2023-08-18 18:11:05 -07:00
Mikayla Maki
24fbea1557
Update collab_panel.rs 2023-08-18 15:34:35 -07:00
Mikayla
8ef671d7a1
Move the collab panel to the left by default 
Increase the indent size on channels
Switch font UI mono
 2023-08-18 15:04:22 -07:00
Max Brunsfeld
802911d742
Fix AppKit screen coordinate conversion leading to wrong window bounds (#2856) 
Fixes
https://linear.app/zed-industries/issue/Z-1510/join-project-notification-takes-up-full-screen-on-a-second-monitor

There were multiple mistakes in the positioning of Zed's notification
windows, one of which lead to the notifications taking up the full
screen on secondary displays 😱 .
* Wrong sign for the vertical padding (moving the window *upward*
instead of downward)
* Using the screen's full frame instead of its "visible frame" (which
accounts for app menu bar)
* Wrong coordinate translation between our coordinates and AppKit's
coordinates. Regardless of which display a given window appears on, the
coordinate translation needs to use the height of the *main* display.

Release Notes:

- Fixed a bug where call notifications were accidentally full-screen on
all displays except the main display.
 2023-08-17 16:24:46 -07:00
Max Brunsfeld
d9ef987b04 Fix AppKit screen coordinate conversion leading to wrong window bounds 2023-08-17 15:23:28 -07:00
Mikayla
05becc75d1
Collapse offline section by default 2023-08-16 19:51:41 -07:00
Mikayla
2f16147055
Fix dock resizing 2023-08-16 19:47:54 -07:00
Nate Butler
925e09e012 Update collab panel empty state to match project panel 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:56:11 -04:00
Nate Butler
43127384c6 Update modal icon styles 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:48:12 -04:00
Max Brunsfeld
706227701e Keep collab panel focused after deleting a channel 2023-08-15 16:14:24 -07:00
Nate Butler
28649fb71d Update channel context menu 2023-08-15 18:36:23 -04:00
Max Brunsfeld
1ffde7bddc Implement calling contacts into your current channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-15 14:56:54 -07:00
Nate Butler
13cf3ada39 Update checked icon 2023-08-15 16:29:01 -04:00
Max Brunsfeld
46928fa871 Reword channel-creation tooltips 2023-08-15 13:08:44 -07:00
Mikayla
d13cedb248
seperate out channel styles in theme 2023-08-15 12:12:30 -07:00
Mikayla
d05e8852d3
Add dismiss on escape 2023-08-15 11:02:18 -07:00
Mikayla
d95b036fde
Fix cursor style 
co-authored-by: Nate <nate@zed.dev>
 2023-08-15 10:58:31 -07:00
Mikayla
e36dfa0946
Add active styling 2023-08-15 10:53:30 -07:00
Mikayla
9e99b74fce
Add the channel name into the current call 2023-08-15 10:45:36 -07:00
Mikayla
111e17b220
Merge branch 'main' into collab-panel 2023-08-15 03:25:45 -07:00
Mikayla
e5eed29c72
Add components example 
Re-arrange generics on mouse event handler
Add TypeTag struct for dynamically tagged components
 2023-08-15 03:06:43 -07:00
Max Brunsfeld
cbf497bc12 Fix race condition when UpdateChannel message is received while fetching participants for previous update 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 17:36:35 -07:00
Max Brunsfeld
71454ba27c Limit number of participants shown in channel face piles 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 17:11:03 -07:00
Max Brunsfeld
13982fe2f4 Display intended mute status while still connecting to a room 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 16:47:26 -07:00
Max Brunsfeld
d7f21a9155 Ensure channels are sorted alphabetically 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 16:27:35 -07:00
Nate Butler
f2d46e0ff9 Use new icons in channel panel 2023-08-14 15:57:31 -04:00
Nathan Sobo
740b105330 Merge branch 'main' into taffy 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-08-14 13:50:21 -06:00
Max Brunsfeld
3b10ae9310 Add icon before the empty contacts text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 11:57:19 -07:00
Max Brunsfeld
2bb9f7929d Structure the contact finder more similarly to the channel modal 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 11:37:05 -07:00
Mikayla
b07555b6df
Make empty state interactive 2023-08-14 10:34:00 -07:00
Mikayla
fde9653ad8
Add placeholder implementation 2023-08-14 10:24:00 -07:00
Mikayla
a90c0e0326
Merge branch 'main' into collab-panel 2023-08-12 12:44:22 -07:00
Nathan Sobo
84dc4090bd Wire up per corner radii for quad 
Still need to expose this in the styling layer and allow images
to have per corner radii.
 2023-08-12 10:40:23 -06:00
Mikayla
9b5551a079
split into body and header 2023-08-11 11:35:51 -07:00
Nate Butler
ff1261b300 WIP Restyle channel modal 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-08-11 13:32:46 -04:00
Piotr Osiewicz
ffffbbea1f
chore: use Cow instead of String for tooltips (#2838) 
A QoL change to align `Tooltip` with other elements like `Label`
Release Notes:

- N/A
 2023-08-11 15:29:55 +02:00
Nathan Sobo
0bf607cd2d WIP 2023-08-10 10:26:48 -06:00
Max Brunsfeld
b3447ada27 Dial in the channel creating/renaming UI 
* Ensure channel list is in a consistent state with no flicker while the
  channel creation / rename request is outstanding.
* Maintain selection properly when renaming and creating channels.
* Style the channel name editor more consistently with the non-editable
  channel names.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 17:11:57 -07:00
Mikayla
a3623ec2b8
Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Mikayla
707e41ce1f
Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel 2023-08-09 10:44:50 -07:00
Mikayla
99daa73325
Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nate Butler
beffe6f6a9 WIP BROKEN 2023-08-09 12:44:34 -04:00
Mikayla
a5cb4c6d52
Fix selections and enter-to-create-file 2023-08-09 08:54:24 -07:00
Nathan Sobo
db96fb1307 Merge remote-tracking branch 'origin/main' into paint-context 2023-08-08 18:27:16 -06:00
Mikayla
bbe4a9b388
Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 14:06:29 -07:00
Mikayla
b708824d37
Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 12:46:13 -07:00
Mikayla
6a7245b92b
Fix positioning on face piles, fix panic on member invite removal 2023-08-08 10:44:44 -07:00
Nathan Sobo
b2d9ccc0a2 Move more window methods off AsyncAppContext 2023-08-08 11:38:07 -06:00
Nathan Sobo
d896d89842 Store an AnyWindowHandle in WindowContext 2023-08-08 11:08:37 -06:00
Nathan Sobo
dba2facd23 Remove window via handles 2023-08-07 22:58:01 -06:00
Nathan Sobo
486f5bc6ca Get compiling 2023-08-07 19:08:58 -06:00
Max Brunsfeld
299906346e Change collab panel icon 2023-08-07 18:04:41 -07:00
Mikayla
fa71de8842
Tune UX for context menus 
Co-authored-by: max <max@zed.dev>
 2023-08-07 17:14:14 -07:00
Mikayla
bedf60b6b2
Improve local collaboration script to accept a zed impersonate 
Gate channels UI behind a flag

co-authored-by: max <max@zed.dev>
 2023-08-07 16:45:13 -07:00
Mikayla
8980a9f1c1
Add settings for removing the assistant and collaboration panel buttons 
Add a not-logged-in state to the collaboration panel

co-authored-by: max <max@zed.dev>
 2023-08-07 16:27:47 -07:00
Mikayla
e37e76fc0b
Add context menu controls to the channel member management 
co-authored-by: Max <max@zed.dev>
 2023-08-07 15:29:30 -07:00
Mikayla
9913067e51
Remove admin and member button 
Fix bug with invites in the member list
Fix bug when there are network errors in the member related RPC calls

co-authored-by: Max <max@zed.dev>
 2023-08-07 14:32:13 -07:00
Mikayla
90cdbe8bf3
Fix modal click throughs and adjust height for channel modal 2023-08-07 13:39:05 -07:00
Mikayla
f1957b1737
Push focus and fix keybindings 2023-08-07 13:31:58 -07:00
Max Brunsfeld
c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo
adc50469ff WIP 2023-08-06 12:45:31 -06:00
Max Brunsfeld
2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max Brunsfeld
87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld
a2486de045 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld
95b1ab9574 Implement channel member removal, permission check for member retrieval 2023-08-03 18:03:40 -07:00
Max Brunsfeld
4a6c73c6fd Lay-out channel modal with picker beneath channel name and mode buttons 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 16:15:29 -07:00
Nathan Sobo
485c0a482e Don't refcount window handles 2023-08-03 17:11:47 -06:00
Max Brunsfeld
a7e883d956 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Max Brunsfeld
9a1dd0c6bc Fetch channel members before constructing channel mgmt modal 2023-08-03 12:10:53 -07:00
Mikayla Maki
6c4964f071
WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Mikayla Maki
d450c4be9a
WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Max Brunsfeld
0ae1f29be8 wip 2023-08-02 15:52:56 -07:00
Max Brunsfeld
fca8cdcb8e Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Nathan Sobo
884cee6dfd Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Mikayla Maki
7145f47454
Fix a few bugs in how channels are moved around 2023-08-01 18:42:14 -07:00
Max Brunsfeld
6a404dfe31 Start work on adding sub-channels in the UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-01 18:20:25 -07:00
Mikayla Maki
74437b3988
Add remove channel method 
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
 2023-08-01 16:06:27 -07:00
Mikayla Maki
56d4d5d1a8
Add root channel UI 
co-authored-by: Max <max@zed.dev>
 2023-08-01 13:33:31 -07:00
Mikayla Maki
7434d66fdd
WIP: Add channel creation to panel UI 2023-08-01 13:22:06 -07:00
Max Brunsfeld
7954b02819 Start work on displaying channels and invites in collab panel 2023-07-31 18:00:14 -07:00
Max Brunsfeld
bb70901e71
WIP 2023-07-28 13:24:43 -07:00
Mikayla Maki
40c293e184
Add channel_modal file 2023-07-28 13:24:43 -07:00
Mikayla Maki
1549c2274f
Create channel adding modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld
4a088fc4ae
Make major collab panel headers non-interactive 2023-07-28 13:24:43 -07:00
Max Brunsfeld
fc49194535
Restructure collab panel, make contact finder into a normal modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld
87dfce94ae
Rename contact list theme to collab panel 2023-07-28 13:24:43 -07:00
Max Brunsfeld
969ecfcfa2
Reinstate all of the contacts popovers' functionality in the new collaboration panel 2023-07-28 13:24:43 -07:00
Mikayla Maki
7f9df6dd24
Move channels panel into collab and rename to collab panel 
remove contacts popover and add to collab panel
 2023-07-28 13:24:42 -07:00
Joseph T. Lyons
3979454485 Follow naming convention for menu items 2023-07-27 17:13:37 -04:00
Nathan Sobo
1b03c5d69c Pass PaintContext to Element::paint 
I want to use this on another branch, but it's a sweeping change,
so this prepares the ground for it. This can always be reverted if
it doesn't work out.
 2023-07-25 17:32:31 -06:00
Joseph T. Lyons
719c56734a Reuse previously-obtained call object 2023-07-20 16:21:21 -04:00