mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #2173 from zed-industries/tab-bar-background-focus-pane

Browse source 
Focus pane when clicking on tab bar background
This commit is contained in:
Julia 2023-02-15 16:07:10 -05:00 committed by GitHub
commit 8bd20d8c3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1420,23 +1420,40 @@ impl View for Pane {
Stack::new() Stack::new()
.with_child( .with_child(
MouseEventHandler::<MouseNavigationHandler>::new(0, cx, |_, cx| { MouseEventHandler::<MouseNavigationHandler>::new(0, cx, |_, cx| {
let active_item_index = self.active_item_index;
if let Some(active_item) = self.active_item() { if let Some(active_item) = self.active_item() {
Flex::column() Flex::column()
.with_child({ .with_child({
let theme = cx.global::<Settings>().theme.clone();
let mut stack = Stack::new();
enum TabBarEventHandler {}
stack.add_child(
MouseEventHandler::<TabBarEventHandler>::new(0, cx, |_, _| {
Flex::row()
.contained()
.with_style(theme.workspace.tab_bar.container)
.boxed()
})
.on_click(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ActivateItem(active_item_index));
})
.boxed(),
);
let mut tab_row = Flex::row() let mut tab_row = Flex::row()
.with_child(self.render_tabs(cx).flex(1., true).named("tabs")); .with_child(self.render_tabs(cx).flex(1., true).named("tabs"));
// Render pane buttons
let theme = cx.global::<Settings>().theme.clone();
if self.is_active { if self.is_active {
tab_row.add_child(self.render_tab_bar_buttons(&theme, cx)) tab_row.add_child(self.render_tab_bar_buttons(&theme, cx))
} }
tab_row stack.add_child(tab_row.boxed());
stack
.constrained() .constrained()
.with_height(theme.workspace.tab_bar.height) .with_height(theme.workspace.tab_bar.height)
.contained()
.with_style(theme.workspace.tab_bar.container)
.flex(1., false) .flex(1., false)
.named("tab bar") .named("tab bar")
}) })