oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,627 Commits 1 Branch 0 Tags
8d94de8eb2e6b6b48f9a45b4aeb7a92c7176f4b8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan SoboandAntonio Scandurra 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
Nathan Sobo 77b13b1356 Merge pull request #1788 from zed-industries/style 
Apply a slight stylistic tweak
 2022-10-20 18:43:50 -06:00
Nathan Sobo 2e97e2dbfd Apply a slight stylistic tweak 2022-10-20 18:38:27 -06:00
Nathan Sobo 0ef62fc334 Preserve symlinks in WebRTC.framework to avoid bundle signing failure 2022-10-20 14:37:04 -06:00
Nathan Sobo 6bdb08ab9c Fix crash loading Swift symbol (I think associated with concurrency) 
I add /usr/lib/swift as an rpath, which seems to fix the issue even though
there doesn't seem to be a relevant library at that location on my machine.

Based on my research, wondering if `-Wl,-weak-lswiftCompatibilityConcurrency`
is also required for this to work on older OSes, but holding back for now.
 2022-10-20 13:18:53 -06:00
Nathan SoboMax BrunsfeldJoseph Lyons
 		9858906463 Return an optional response when creating users via invites 
If the user already exists, we return none. This will allow the web frontend
to avoid reporting a "join alpha" user event but also not error.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
 2022-10-20 10:52:34 -06:00
Nathan Sobo 69472f7823 Ensure we can send a second frame 2022-10-19 19:21:09 -06:00
Nathan Sobo 723fa83909 Use fake LiveKit server to test we can send frames when screen sharing 2022-10-19 19:14:55 -06:00
Nathan Sobo f8e5a08324 Merge pull request #1764 from zed-industries/gpui-events 
Eliminate dispatch_event on Element trait
 2022-10-18 15:24:13 -06:00
Nathan Sobo a42a703b35 Pass tracks to Rust unretained 
We always call CFRetain when constructing a track on the Rust side.
 2022-10-17 23:56:41 -06:00
Nathan Sobo 59fab0bb2d WIP 2022-10-17 23:47:55 -06:00
Nathan Sobo c73e2c2d0f Get test_app running without crashing 2022-10-17 23:38:43 -06:00
Nathan Sobo 8c1c98a0bf WIP 2022-10-17 23:25:04 -06:00
Nathan Sobo 19a2752674 WIP: Update token module to support server api 2022-10-17 09:59:16 +02:00
Nathan Sobo 9569323f93 WIP: Getting a big black window, then a crash 2022-10-17 09:59:16 +02:00
Nathan SoboandAntonio Scandurra 0bbba90f30 Use ScreenCaptureKit-enabled LiveKit SDK and add display_sources function 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-17 09:59:16 +02:00
Nathan Sobo 12eab6551f Remove dispatch_event from Element trait 2022-10-16 13:08:25 -06:00
Nathan Sobo d25c6b15a6 Move Terminal key down event handling from element to View::key_down method 2022-10-16 12:55:02 -06:00
Nathan Sobo b9308ad80d Move handling of modifier changes to new View hook 2022-10-16 12:47:48 -06:00
Nathan Sobo 6e363e464c Start on view-level dispatch approach for keyboard events 2022-10-16 11:46:31 -06:00
Nathan Sobo 6e53deb1b2 Refine mouse event naming 2022-10-16 11:18:58 -06:00
Nathan Sobo 3e23d1f48d Merge pull request #1762 from zed-industries/less-click-and-hover-invalidation 
Reduce unnecessary view invalidations related to mouse events
 2022-10-16 10:23:54 -06:00
Nathan Sobo 1750fcf833 Merge pull request #1761 from zed-industries/mouse-region-view-invalidation 
Remove unconditional invalidation when calling mouse region handlers
 2022-10-14 18:31:23 -06:00
Nathan SoboandMax Brunsfeld 646d344a11 Avoid re-rendering editor on mouse move 
Only notify editor when clearing highlights if there were highlights to
begin with.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-14 18:27:55 -06:00
Nathan SoboandMax Brunsfeld 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
Nathan Sobo 934474f87e Remove unconditional invalidation when calling mouse region handlers 
We want invalidation to opt-in as much as possible.
If you want a view to re-render, you need to call `cx.notify`.
 2022-10-14 17:06:46 -06:00
Nathan Sobo eef086f60f 0.60.2 2022-10-13 16:26:26 -06:00
Nathan Sobo 6ac0b81778 Merge pull request #1754 from zed-industries/fix-list-scroll 
Pass the current view id when painting List's mouse region instead of 10
 2022-10-13 16:24:55 -06:00
Nathan Sobo 8d82702da2 Pass the current view id value when painting List's mouse region 
Previously, a dummy value was being passed. I think this slipped in accidentally.
 2022-10-13 15:57:19 -06:00
Nathan Sobo e0b6b0df2a Rename Join button to Open, rework message slightly 2022-10-10 18:12:00 -06:00
Nathan SoboandAntonio Scandurra 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
Nathan Sobo 425e540c9a Fix tests by providing close: true 2022-10-10 15:29:24 -06:00
Nathan Sobo 3ae96f2c6e Don't autoclose brackets when is false 2022-10-10 15:15:43 -06:00
Nathan SoboandAntonio Scandurra 8ff4f044b7 Start a call when clicking on a contact in the contacts popover 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-09-28 11:02:26 -06:00
Nathan SoboandAntonio Scandurra 815cf44647 Rename AddParticipantPopover to ContactsPopover 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-09-28 09:10:01 -06:00
Nathan SoboandAntonio Scandurra f5b2d56efd Remove contacts menu bar extra 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-09-28 09:06:28 -06:00
Nathan SoboandMax Brunsfeld 824fdb54e6 Report editor open and save events to Amplitude 
Co-authored-by: Max Brunsfeld <max@zed.dev>
 2022-09-26 18:18:34 -06:00
Nathan SoboandJoseph Lyons f0c50c1e0a Extract db module from project to its own crate 
This will let us use it from the telemetry crate.

Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2022-09-26 16:37:09 -06:00
Nathan Sobo 0c4c5f9238 0.54.1 2022-09-21 10:36:46 -06:00
Nathan Sobo 7bf64ec23e Add ability to get a screen share track for a window 
And also list windows
 2022-09-13 14:10:13 +02:00
Nathan Sobo 5347c7d678 Connect to LiveKit room in capture example 2022-09-13 14:10:13 +02:00
Nathan SoboandAntonio Scandurra 45d83b557b Remove LiveKitObjC experiment 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-09-13 14:10:13 +02:00
Nathan SoboandAntonio Scandurra 3c2566fc11 Copy WebRTC.framework when building livekit crate 
We determine the location of the target executable directory in a somewhat hacky way, but it seems reasonably stable.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-09-13 14:10:13 +02:00
Nathan Sobo 4bcc008cbf WIP: Start on live_kit crate that uses a C-based bridge 2022-09-13 14:10:13 +02:00
Nathan Sobo b51abc5a63 Read the frame data out of the CMSampleBuffer 
Still not sending it anywhere, but think I'm reading it correctly.
 2022-09-13 14:10:13 +02:00
Nathan Sobo 37da841716 Start on using CVMetalTextureCache 2022-09-13 14:10:13 +02:00
Nathan Sobo 531ffc01c9 Pass CVImageBuffers into GPUI instead of IOSurfaces 2022-09-13 14:10:13 +02:00
Nathan Sobo 0430bbf7d9 WIP: Start on Renderer::render_surfaces but really it's nothing 2022-09-13 14:10:13 +02:00
Nathan Sobo db88ee2f4c Handle captured frames in the background 2022-09-13 14:10:13 +02:00
Nathan Sobo 82ec2dc7ca Try to use the dummy capture handler, still not working 2022-09-13 14:10:13 +02:00
Nathan Sobo 99cb66dfb0 Programmatically locate the system SDK path for bindgen 2022-09-13 14:10:13 +02:00
Nathan Sobo 4440c9b18e Bind to capture's macOS C frameworks with bindgen 2022-09-13 14:10:13 +02:00
Nathan Sobo 0df97dce02 WIP 2022-09-13 14:10:13 +02:00
Nathan Sobo 497232ee59 Get capture starting without error 2022-09-13 14:10:13 +02:00
Nathan Sobo d91f26d016 Make SCStreamOutput protocol accessible in Rust 2022-09-13 14:10:13 +02:00
Nathan Sobo 7918bf39f5 Make capture example its own crate 2022-09-13 14:10:13 +02:00
Nathan Sobo ad0f75f386 Add capture example to GPUI 
Added a linker arg to the GPUI build script. Not sure if we'll want to bake
this into GPUI or do it via another crate, but this is convenient for
exploration for now.
 2022-09-13 14:10:13 +02:00
Nathan Sobo daf33fc657 Merge pull request #1557 from zed-industries/operations-hang 
Prevent guest disconnection when opening buffers with many operations
 2022-08-24 08:47:39 -06:00
Nathan Sobo d3904cd961 v0.51.1 2022-08-17 09:47:19 -06:00
Nathan Sobo 062105edb9 Merge pull request #1532 from zed-industries/fix-adding-contacts 
Fix focus regression in contact finder
 2022-08-17 09:43:04 -06:00
Nathan SoboandAntonio Scandurra 443432606e Fix focus regression in contact finder 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-08-17 09:33:48 -06:00
Nathan Sobo 805c06ee76 Merge pull request #1298 from zed-industries/mouse-region-refactor 
Mouse Event Refactor
 2022-07-07 16:43:36 -06:00
Nathan Sobo 4da3005b5c Allow users with no invites to be fetched from the API 2022-06-24 09:57:52 -06:00
Nathan Sobo 44c8ee5709 Add mouse down out handlers 
These will fire whenever the left/right mouse button is pressed down outside a specific region. I'll use these to cancel the context menu in the next commit.
 2022-05-27 12:56:44 -06:00
Nathan Sobo 9909fc529b Allow context menu to be cancelled after deploying it twice 
Previously, two right clicks would cause an issue with cancelling the context menu via escape.
 2022-05-27 12:00:11 -06:00
Nathan Sobo c3baf2748f Block hovering behind overlays 2022-05-27 11:54:51 -06:00
Nathan Sobo 5413a97c7e Restrict multiple hovered regions to a single stacking context 
We won't hover regions from stacking contexts that are below the one being hovered.
 2022-05-27 11:09:07 -06:00
Nathan Sobo aedfd74d30 Use the hit bounds when painting mouse regions 2022-05-26 20:05:20 -06:00
Nathan SoboandMax Brunsfeld 893f15ddab Switch MouseEventHandler to use MouseRegions 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 20:00:01 -06:00
Nathan SoboandMax Brunsfeld 50edcb06dd Add drag callbacks to mouse regions 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 18:59:38 -06:00
Nathan SoboandMax Brunsfeld bd62a68234 Eliminate ElementStateContext trait 
We now always have a RenderContext when rendering MouseEventHandlers or scrollable Flex columns/rows.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 18:37:28 -06:00
Nathan SoboandMax Brunsfeld b6b16fc9c3 In UniformList, guard against misbehavior of append_items 
If for some reason the handle got dropped and we call it, we'll deal with it somewhat gracefully.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 18:30:28 -06:00
Nathan SoboandMax Brunsfeld 8dd82fdce1 Take a RenderContext in ListState's build item callback 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 18:23:44 -06:00
Nathan SoboandMax Brunsfeld 2ea085b178 Pass a RenderContext to UniformList 
In some cases, we need to render during layout. Previously, we were rendering with a LayoutContext in some cases, but this commit adds the ability to retrieve a render context with a given handle and we use that feature in UniformList.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-26 18:03:34 -06:00
Nathan Sobo d69776585d Add mouse_state method to RenderContext 
We can use this to determine if a region is hovered or clicked.
 2022-05-26 13:22:23 -06:00
Nathan Sobo 3a59d2a331 Allow hovered and clicked mouse regions to be tracked in the presenter 2022-05-26 12:44:52 -06:00
Nathan SoboandAntonio Scandurra 0866f0ed55 Introduce CursorRegion struct 
This will blend in with an upcoming MouseRegion struct that sits next to it in the scene.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-26 11:00:10 -06:00
Nathan SoboandAntonio Scandurra c0aafac387 Put keystrokes in their own column 
This requires rendering the menu for measurement in a totally different way, where the top level is a flex row. We don't want to render the menu like this for presentation because of hovers / highlights on individual items needing to include the keystrokes.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-26 09:59:25 +02:00
Nathan Sobo dcee8439b6 Start on context_menu crate 2022-05-26 09:59:25 +02:00
Nathan Sobo b428d0de38 Break context menu items out in theme 2022-05-26 09:59:25 +02:00
Nathan Sobo 6b96822c1a Fix editor tests 2022-05-26 09:59:25 +02:00
Nathan Sobo 5b7825d5de Add MutableAppContext::keystrokes_for_action 
This can be used to lookup keystrokes that will dispatch an action based on the currently focused view. There might be multiple, but we return the first found, meaning the most recently added bindings matching that action for the closest view to the focused view in the hierarchy.
 2022-05-26 09:59:25 +02:00
Nathan Sobo b110fd5fb7 Render a context menu when right-clicking in project panel 
It doesn't currently do anything, but I managed to get it rendering in an absolutely positioned way.
 2022-05-26 09:59:25 +02:00
Nathan Sobo 742dd75041 Implement /rpc_server_snapshot endpoint 
This returns a JSON snapshot of the state of the server
 2022-05-25 17:42:25 -06:00
Nathan Sobo 6a32d55d85 Merge pull request #1065 from zed-industries/fix-build-script 
Fix theme build issue in build.rs
 2022-05-25 15:51:32 -06:00
Nathan Sobo 5fd2c5cb2e v0.35.0 2022-05-24 11:32:12 -06:00
Nathan Sobo d30d2d67e7 Merge pull request #1049 from zed-industries/invite-codes-2 
Support inviting new Zed users
 2022-05-23 18:29:51 -06:00
Nathan Sobo 4cedf056a9 Bump protocol version 2022-05-23 18:18:15 -06:00
Nathan Sobo 6ed503fe6e Implement get_invite_code_for_user on test db 2022-05-23 18:07:23 -06:00
Nathan SoboandMax Brunsfeld 5c2fdc01ff Update foreign key constraints to allow users to be deleted 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:46:06 -06:00
Nathan SoboandMax Brunsfeld 51a61cc485 Don't assign invite code when updating count from 0 to 0 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:28:05 -06:00
Nathan Sobo 4b8f24c84e Set INVITE_LINK_PREFIX in K8s 2022-05-23 15:49:51 -06:00
Nathan Sobo d8dbbf1c05 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Nathan Sobo 7a8ff5abd7 Accept an optional email address when creating new users 2022-05-20 20:25:21 -06:00
Nathan SoboandAntonio Scandurra eedb8ba59f Add affordance to copy user's invite link if they have a code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 17:57:46 -06:00
Nathan SoboandAntonio Scandurra a3bbabaaac Add ability to get the user for an invite code in collab API 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 12:35:07 -06:00
Nathan SoboandAntonio Scandurra 3d7e912c6b Enable descriptive HTTP errors to be returned from DB layer 
For now, we only use this when redeeming an invite code.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 11:55:55 -06:00
Nathan Sobo d1b7a249b4 WIP 2022-05-19 11:09:44 -06:00
Nathan Sobo 51f9b915a0 WIP 2022-05-18 16:14:58 -06:00
Nathan Sobo 37fcfeab8d WIP 2022-05-18 11:51:47 -06:00