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

pane: Fix panic when dragging non-pinned item onto it's pinned copy in another pane (#20900)

Browse source 
Closes #20889

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-11-20 14:22:07 +01:00 • committed by GitHub
parent 3c57a4071c
commit e03968f538
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2455,6 +2455,8 @@ impl Pane {
to_pane = workspace.split_pane(to_pane, split_direction, cx); to_pane = workspace.split_pane(to_pane, split_direction, cx);
} }
let old_ix = from_pane.read(cx).index_for_item_id(item_id); let old_ix = from_pane.read(cx).index_for_item_id(item_id);
let old_len = to_pane.read(cx).items.len();
move_item(&from_pane, &to_pane, item_id, ix, cx);
if to_pane == from_pane { if to_pane == from_pane {
if let Some(old_index) = old_ix { if let Some(old_index) = old_ix {
to_pane.update(cx, |this, _| { to_pane.update(cx, |this, _| {
@ -2472,7 +2474,10 @@ impl Pane {
} }
} else { } else {
to_pane.update(cx, |this, _| { to_pane.update(cx, |this, _| {
if this.has_pinned_tabs() && ix < this.pinned_tab_count { if this.items.len() > old_len // Did we not deduplicate on drag?
&& this.has_pinned_tabs()
&& ix < this.pinned_tab_count
{
this.pinned_tab_count += 1; this.pinned_tab_count += 1;
} }
}); });
@ -2484,7 +2489,6 @@ impl Pane {
} }
}) })
} }
move_item(&from_pane, &to_pane, item_id, ix, cx);
}); });
}) })
.log_err(); .log_err();