Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into fix-panel-resize

Browse source
This commit is contained in:
Max Brunsfeld 2023-12-19 08:55:55 -08:00
commit cf037ea4a8
13 changed files with 131 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/workspace2/src/pane.rs
View file

@ -1493,6 +1493,14 @@ impl Pane {
.on_click(
cx.listener(move |pane: &mut Self, _, cx| pane.activate_item(ix, true, true, cx)),
)
// TODO: This should be a click listener with the middle mouse button instead of a mouse down listener.
.on_mouse_down(
MouseButton::Middle,
cx.listener(move |pane, _event, cx| {
pane.close_item_by_id(item_id, SaveIntent::Close, cx)
.detach_and_log_err(cx);
}),
)
.on_drag(
DraggedTab {
pane: cx.view().clone(),

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

@ -2520,8 +2520,7 @@ impl Workspace {
.any(|item| item.has_conflict(cx) || item.is_dirty(cx));
if is_edited != self.window_edited {
self.window_edited = is_edited;
// todo!()
// cx.set_window_edited(self.window_edited)
cx.set_window_edited(self.window_edited)
}
}