
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
104 lines
4 KiB
Rust
104 lines
4 KiB
Rust
use crate::track::RemoteVideoTrack;
|
|
use anyhow::Result;
|
|
use futures::StreamExt as _;
|
|
use gpui::{AppContext, Context, Empty, Entity, EventEmitter, IntoElement, Render, Task, Window};
|
|
|
|
pub struct RemoteVideoTrackView {
|
|
track: RemoteVideoTrack,
|
|
latest_frame: Option<crate::RemoteVideoFrame>,
|
|
#[cfg(not(target_os = "macos"))]
|
|
current_rendered_frame: Option<crate::RemoteVideoFrame>,
|
|
#[cfg(not(target_os = "macos"))]
|
|
previous_rendered_frame: Option<crate::RemoteVideoFrame>,
|
|
_maintain_frame: Task<Result<()>>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum RemoteVideoTrackViewEvent {
|
|
Close,
|
|
}
|
|
|
|
impl RemoteVideoTrackView {
|
|
pub fn new(track: RemoteVideoTrack, window: &mut Window, cx: &mut Context<Self>) -> Self {
|
|
cx.focus_handle();
|
|
let frames = super::play_remote_video_track(&track);
|
|
let _window_handle = window.window_handle();
|
|
|
|
Self {
|
|
track,
|
|
latest_frame: None,
|
|
_maintain_frame: cx.spawn_in(window, |this, mut cx| async move {
|
|
futures::pin_mut!(frames);
|
|
while let Some(frame) = frames.next().await {
|
|
this.update(&mut cx, |this, cx| {
|
|
this.latest_frame = Some(frame);
|
|
cx.notify();
|
|
})?;
|
|
}
|
|
this.update(&mut cx, |_this, cx| {
|
|
#[cfg(not(target_os = "macos"))]
|
|
{
|
|
use util::ResultExt as _;
|
|
if let Some(frame) = _this.previous_rendered_frame.take() {
|
|
_window_handle
|
|
.update(cx, |_, window, _cx| window.drop_image(frame).log_err())
|
|
.ok();
|
|
}
|
|
// TODO(mgsloan): This might leak the last image of the screenshare if
|
|
// render is called after the screenshare ends.
|
|
if let Some(frame) = _this.current_rendered_frame.take() {
|
|
_window_handle
|
|
.update(cx, |_, window, _cx| window.drop_image(frame).log_err())
|
|
.ok();
|
|
}
|
|
}
|
|
cx.emit(RemoteVideoTrackViewEvent::Close)
|
|
})?;
|
|
Ok(())
|
|
}),
|
|
#[cfg(not(target_os = "macos"))]
|
|
current_rendered_frame: None,
|
|
#[cfg(not(target_os = "macos"))]
|
|
previous_rendered_frame: None,
|
|
}
|
|
}
|
|
|
|
pub fn clone(&self, window: &mut Window, cx: &mut Context<Self>) -> Entity<Self> {
|
|
cx.new(|cx| Self::new(self.track.clone(), window, cx))
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<RemoteVideoTrackViewEvent> for RemoteVideoTrackView {}
|
|
|
|
impl Render for RemoteVideoTrackView {
|
|
fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
|
|
#[cfg(target_os = "macos")]
|
|
if let Some(latest_frame) = &self.latest_frame {
|
|
use gpui::Styled as _;
|
|
return gpui::surface(latest_frame.clone())
|
|
.size_full()
|
|
.into_any_element();
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
if let Some(latest_frame) = &self.latest_frame {
|
|
use gpui::Styled as _;
|
|
if let Some(current_rendered_frame) = self.current_rendered_frame.take() {
|
|
if let Some(frame) = self.previous_rendered_frame.take() {
|
|
// Only drop the frame if it's not also the current frame.
|
|
if frame.id != current_rendered_frame.id {
|
|
use util::ResultExt as _;
|
|
_window.drop_image(frame).log_err();
|
|
}
|
|
}
|
|
self.previous_rendered_frame = Some(current_rendered_frame)
|
|
}
|
|
self.current_rendered_frame = Some(latest_frame.clone());
|
|
return gpui::img(latest_frame.clone())
|
|
.size_full()
|
|
.into_any_element();
|
|
}
|
|
|
|
Empty.into_any_element()
|
|
}
|
|
}
|