mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 10:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Introduce a new WindowContext::remove_window API

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-04-21 16:39:53 +02:00
parent f12746c4b7
commit 8c7f821d14
8 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/collab_ui/src/project_shared_notification.rs
View file

@ -94,14 +94,12 @@ impl ProjectSharedNotification {
}
fn join(&mut self, _: &JoinProject, cx: &mut ViewContext<Self>) {
let window_id = cx.window_id();
cx.remove_window(window_id);
cx.remove_window();
cx.propagate_action();
}
fn dismiss(&mut self, _: &DismissProject, cx: &mut ViewContext<Self>) {
let window_id = cx.window_id();
cx.remove_window(window_id);
cx.remove_window();
}
fn render_owner(&self, cx: &mut ViewContext<Self>) -> Element<Self> {

8
crates/copilot/src/sign_in.rs
View file

@ -273,10 +273,7 @@ impl CopilotCodeVerification {
style.auth.content_width,
&style.auth.cta_button,
cx,
|_, _, cx| {
let window_id = cx.window_id();
cx.remove_window(window_id)
},
|_, _, cx| cx.remove_window(),
)
.boxed(),
])
@ -335,8 +332,7 @@ impl CopilotCodeVerification {
&style.auth.cta_button,
cx,
|_, _, cx| {
let window_id = cx.window_id();
cx.remove_window(window_id);
cx.remove_window();
cx.platform().open_url(COPILOT_SIGN_UP_URL)
},
)

4
crates/gpui/src/app.rs
View file

@ -868,7 +868,9 @@ impl AppContext {
let mut window = app_context.windows.remove(&window_id)?;
let mut window_context = WindowContext::mutable(app_context, &mut window, window_id);
let result = callback(&mut window_context);
app_context.windows.insert(window_id, window);
if !window_context.removed {
app_context.windows.insert(window_id, window);
}
Some(result)
})
}

7
crates/gpui/src/app/window.rs
View file

@ -116,6 +116,7 @@ pub struct WindowContext<'a: 'b, 'b> {
pub(crate) window: Reference<'b, Window>,
pub(crate) window_id: usize,
pub(crate) refreshing: bool,
pub(crate) removed: bool,
}
impl Deref for WindowContext<'_, '_> {
@ -216,6 +217,7 @@ impl<'a: 'b, 'b> WindowContext<'a, 'b> {
window: Reference::Mutable(window),
window_id,
refreshing: false,
removed: false,
}
}
@ -225,9 +227,14 @@ impl<'a: 'b, 'b> WindowContext<'a, 'b> {
window: Reference::Immutable(window),
window_id,
refreshing: false,
removed: false,
}
}
pub fn remove_window(&mut self) {
self.removed = true;
}
pub fn window_id(&self) -> usize {
self.window_id
}

3
crates/theme/src/ui.rs
View file

@ -265,8 +265,7 @@ where
icon(style).boxed()
})
.on_click(platform::MouseButton::Left, move |_, _, cx| {
let window_id = cx.window_id();
cx.remove_window(window_id);
cx.remove_window();
})
.with_cursor_style(platform::CursorStyle::PointingHand)
.aligned()

21
crates/workspace/src/pane.rs
View file

@ -1741,8 +1741,6 @@ impl View for Pane {
}
fn render(&mut self, cx: &mut ViewContext<Self>) -> Element<Self> {
let this = cx.handle().downgrade();
enum MouseNavigationHandler {}
Stack::new()
@ -1836,20 +1834,17 @@ impl View for Pane {
.boxed()
}
})
.on_down(MouseButton::Navigate(NavigationDirection::Back), {
let this = this.clone();
.on_down(
MouseButton::Navigate(NavigationDirection::Back),
move |_, _, cx| {
cx.dispatch_action(GoBack {
pane: Some(this.clone()),
});
}
})
let pane = cx.weak_handle();
cx.dispatch_action(GoBack { pane: Some(pane) });
},
)
.on_down(MouseButton::Navigate(NavigationDirection::Forward), {
let this = this.clone();
move |_, _, cx| {
cx.dispatch_action(GoForward {
pane: Some(this.clone()),
})
let pane = cx.weak_handle();
cx.dispatch_action(GoForward { pane: Some(pane) })
}
})
.boxed(),

2
crates/workspace/src/pane/dragged_item_receiver.rs
View file

@ -74,8 +74,8 @@ where
.boxed()
})
.on_up(MouseButton::Left, {
let pane = cx.handle().downgrade();
move |event, _, cx| {
let pane = cx.weak_handle();
handle_dropped_item(event, &pane, drop_index, allow_same_pane, split_margin, cx);
cx.notify();
}

3
crates/workspace/src/workspace.rs
View file

@ -700,8 +700,7 @@ impl Workspace {
}
project::Event::Closed => {
let window_id = cx.window_id();
cx.remove_window(window_id);
cx.remove_window();
}
_ => {}