From c3c4615f7a5b1cb686733656c5725718a940f763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Thu, 31 Mar 2022 20:12:11 +0200 Subject: [PATCH] Fix rebase mistake, use the actual dragged tab index --- lapce-ui/src/editor/tab_header_content.rs | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lapce-ui/src/editor/tab_header_content.rs b/lapce-ui/src/editor/tab_header_content.rs index 3002c642..0d1bcd7d 100644 --- a/lapce-ui/src/editor/tab_header_content.rs +++ b/lapce-ui/src/editor/tab_header_content.rs @@ -92,6 +92,17 @@ fn mouse_down( 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 = data.main_split.editor_tabs.get(&self.widget_id).unwrap(); let tab_rect = &self.rects[target]; + let offset = mouse_event.pos.to_vec2() - tab_rect.rect.origin().to_vec2(); *Arc::make_mut(&mut data.drag) = Some(( offset, DragContent::EditorTab( editor_tab.widget_id, - editor_tab.active, - editor_tab.children[editor_tab.active].clone(), + target, + editor_tab.children[target].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; - } } }