Fix rebase mistake, use the actual dragged tab index

This commit is contained in:
Dániel Buga 2022-03-31 20:12:11 +02:00
parent e57203c603
commit c3c4615f7a
1 changed files with 14 additions and 13 deletions

View File

@ -92,6 +92,17 @@ fn mouse_down(
return; return;
} }
if mouse_event.button.is_middle()
&& tab_rect.rect.contains(mouse_event.pos)
{
ctx.submit_command(Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::EditorTabRemove(i, true, true),
Target::Widget(self.widget_id),
));
return;
}
} }
} }
@ -120,29 +131,19 @@ fn mouse_move(
let editor_tab = let editor_tab =
data.main_split.editor_tabs.get(&self.widget_id).unwrap(); data.main_split.editor_tabs.get(&self.widget_id).unwrap();
let tab_rect = &self.rects[target]; let tab_rect = &self.rects[target];
let offset = let offset =
mouse_event.pos.to_vec2() - tab_rect.rect.origin().to_vec2(); mouse_event.pos.to_vec2() - tab_rect.rect.origin().to_vec2();
*Arc::make_mut(&mut data.drag) = Some(( *Arc::make_mut(&mut data.drag) = Some((
offset, offset,
DragContent::EditorTab( DragContent::EditorTab(
editor_tab.widget_id, editor_tab.widget_id,
editor_tab.active, target,
editor_tab.children[editor_tab.active].clone(), editor_tab.children[target].clone(),
tab_rect.clone(), tab_rect.clone(),
), ),
)); ));
} }
if mouse_event.button.is_middle()
&& tab_rect.rect.contains(mouse_event.pos)
{
ctx.submit_command(Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::EditorTabRemove(i, true, true),
Target::Widget(self.widget_id),
));
return;
}
} }
} }