Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove containers #3312

Merged
merged 2 commits into from
Jun 9, 2024
Merged

Remove containers #3312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5691c81
my changes
jrmoulton Jun 8, 2024
8ac1976
remove extra containers
jrmoulton Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 123 additions & 80 deletions lapce-app/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ use floem::{
AlignItems, CursorStyle, Display, FlexDirection, JustifyContent, Position,
Style,
},
taffy::{
style_helpers::{self, auto, fr},
Line,
},
unit::PxPctAuto,
views::{
clip, container, drag_resize_window_area, drag_window_area, dyn_stack,
Expand Down Expand Up @@ -584,6 +588,7 @@ impl AppData {
}
}

/// The top bar of an Editor tab. Includes the tab forward/back buttons, the tab scroll bar and the new split and tab close all button.
fn editor_tab_header(
window_tab_data: Rc<WindowTabData>,
active_editor_tab: ReadSignal<Option<EditorTabId>>,
Expand Down Expand Up @@ -634,12 +639,11 @@ fn editor_tab_header(
let child_for_mouse_close = child.clone();
let main_split = main_split.clone();
let plugin = plugin.clone();
let child_view = move || {
let child_view = {
let info = child.view_info(editors, diff_editors, plugin, config);
let hovered = create_rw_signal(false);

use crate::config::ui::TabCloseButton;
let tab_close_button_style = config.get().ui.tab_close_button;

let tab_icon = container({
svg(move || info.with(|info| info.icon.clone())).style(move |s| {
Expand All @@ -648,7 +652,7 @@ fn editor_tab_header(
.apply_opt(info.with(|info| info.color), |s, c| s.color(c))
})
})
.style(|s| s.padding_horiz(10.0));
.style(|s| s.padding(4.));

let tab_content = label(move || info.with(|info| info.path.clone()))
.style(move |s| {
Expand All @@ -659,9 +663,6 @@ fn editor_tab_header(
.unwrap_or(true),
|s| s.font_style(FontStyle::Italic),
)
.apply_if(tab_close_button_style == TabCloseButton::Off, |s| {
s.margin_right(15.0)
})
});

let tab_close_button = clickable_icon(
Expand Down Expand Up @@ -691,29 +692,53 @@ fn editor_tab_header(
})
.on_event_stop(EventListener::PointerLeave, move |_| {
hovered.set(false);
})
.style(|s| s.margin_horiz(6.0));
});

let tab_style = move |s: Style| {
stack((
tab_icon.style(move |s| {
let tab_close_button = config.get().ui.tab_close_button;
s.apply_if(tab_close_button == TabCloseButton::Left, |s| {
s.grid_column(Line {
start: style_helpers::line(3),
end: style_helpers::span(1),
})
})
}),
tab_content.style(move |s| {
let tab_close_button = config.get().ui.tab_close_button;
s.apply_if(tab_close_button == TabCloseButton::Left, |s| {
s.grid_column(Line {
start: style_helpers::line(2),
end: style_helpers::span(1),
})
})
.apply_if(tab_close_button == TabCloseButton::Off, |s| {
s.padding_right(4.)
})
}),
tab_close_button.style(move |s| {
let tab_close_button = config.get().ui.tab_close_button;
s.apply_if(tab_close_button == TabCloseButton::Left, |s| {
s.grid_column(Line {
start: style_helpers::line(1),
end: style_helpers::span(1),
})
})
.apply_if(tab_close_button == TabCloseButton::Off, |s| s.hide())
}),
))
.style(move |s| {
s.items_center()
.justify_center()
.height_full()
.border_left(if i.get() == 0 { 1.0 } else { 0.0 })
.border_right(1.0)
.border_color(config.get().color(LapceColor::LAPCE_BORDER))
};

match tab_close_button_style {
TabCloseButton::Left => container(
stack((tab_close_button, tab_content, tab_icon))
.style(tab_style),
),
TabCloseButton::Right => container(
stack((tab_icon, tab_content, tab_close_button))
.style(tab_style),
),
TabCloseButton::Off => {
container(stack((tab_icon, tab_content)).style(tab_style))
}
}
.padding_horiz(6.)
.gap(6.)
.grid()
.grid_template_columns(vec![auto(), fr(1.), auto()])
})
};

let confirmed = match local_child {
Expand All @@ -732,7 +757,7 @@ fn editor_tab_header(
let header_content_size = create_rw_signal(Size::ZERO);
let drag_over_left: RwSignal<Option<bool>> = create_rw_signal(None);
stack((
child_view()
child_view
.on_double_click_stop(move |_| {
if let Some(confirmed) = confirmed {
confirmed.set(true);
Expand Down Expand Up @@ -818,54 +843,59 @@ fn editor_tab_header(
.border_color(config.color(LapceColor::LAPCE_BORDER))
})
.style(|s| s.align_items(Some(AlignItems::Center)).height_full()),
container(empty().style(move |s| {
s.size_full()
.border_bottom(if editor_tab_active.get() == i.get() {
2.0
} else {
0.0
})
.border_color(config.get().color(if is_focused() {
LapceColor::LAPCE_TAB_ACTIVE_UNDERLINE
} else {
LapceColor::LAPCE_TAB_INACTIVE_UNDERLINE
}))
}))
.style(|s| s.absolute().padding_horiz(3.0).size_full()),
empty().style(move |s| {
let i = i.get();
let drag_over_left = drag_over_left.get();
s.absolute()
.margin_left(if i == 0 { 0.0 } else { -2.0 })
.height_full()
.width(
header_content_size.get().width as f32
+ if i == 0 { 1.0 } else { 3.0 },
)
.apply_if(drag_over_left.is_none(), |s| s.hide())
.apply_if(drag_over_left.is_some(), |s| {
if let Some(drag_over_left) = drag_over_left {
if drag_over_left {
s.border_left(3.0)
empty()
.style(move |s| {
s.size_full()
.border_bottom(if editor_tab_active.get() == i.get() {
2.0
} else {
0.0
})
.border_color(config.get().color(if is_focused() {
LapceColor::LAPCE_TAB_ACTIVE_UNDERLINE
} else {
LapceColor::LAPCE_TAB_INACTIVE_UNDERLINE
}))
})
.style(|s| s.absolute().padding_horiz(3.0).size_full())
.debug_name("Drop Indicator"),
empty()
.style(move |s| {
let i = i.get();
let drag_over_left = drag_over_left.get();
s.absolute()
.margin_left(if i == 0 { 0.0 } else { -2.0 })
.height_full()
.width(
header_content_size.get().width as f32
+ if i == 0 { 1.0 } else { 3.0 },
)
.apply_if(drag_over_left.is_none(), |s| s.hide())
.apply_if(drag_over_left.is_some(), |s| {
if let Some(drag_over_left) = drag_over_left {
if drag_over_left {
s.border_left(3.0)
} else {
s.border_right(3.0)
}
} else {
s.border_right(3.0)
s
}
} else {
s
}
})
.border_color(
config
.get()
.color(LapceColor::LAPCE_TAB_ACTIVE_UNDERLINE)
.with_alpha_factor(0.5),
)
}),
})
.border_color(
config
.get()
.color(LapceColor::LAPCE_TAB_ACTIVE_UNDERLINE)
.with_alpha_factor(0.5),
)
})
.debug_name("Active Tab Indicator"),
))
.on_resize(move |rect| {
layout_rect.set(rect);
})
.style(|s| s.height_full())
.debug_name("Tab and Active Indicator")
};

let content_size = create_rw_signal(Size::ZERO);
Expand Down Expand Up @@ -924,8 +954,9 @@ fn editor_tab_header(
.debug_name("Next/Previoius Tab Buttons")
.style(move |s| s.items_center()),
)
}),
container({
})
.style(|s| s.flex_shrink(0.)),
container(
scroll({
dyn_stack(items, key, view_fn)
.on_resize(move |rect| {
Expand All @@ -949,13 +980,12 @@ fn editor_tab_header(
.style(|s| {
s.set(HideBar, true)
.set(VerticalScrollAsHorizontal, true)
.position(Position::Absolute)
.height_full()
.max_width_full()
})
})
.debug_name("Tab scroll")
.style(|s| s.height_full().flex_grow(1.0).flex_basis(0.0)),
.absolute()
.size_full()
}),
)
.style(|s| s.height_full().flex_grow(1.0).flex_basis(0.).min_width(10.))
.debug_name("Tab scroll"),
stack({
let size = create_rw_signal(Size::ZERO);
(
Expand Down Expand Up @@ -1023,11 +1053,22 @@ fn editor_tab_header(
.style(|s| s.items_center().height_full()),
)
})
.style(|s| s.height_full()),
.debug_name("Split/Close Panel Buttons")
.style(move |s| {
let content_size = content_size.get();
let scroll_offset = scroll_offset.get();
s.height_full()
.flex_shrink(0.)
.margin_left(PxPctAuto::Auto)
.apply_if(scroll_offset.x1 < content_size.width, |s| {
s.margin_left(0.)
})
}),
))
.style(move |s| {
let config = config.get();
s.items_center()
.max_width_full()
.border_bottom(1.0)
.border_color(config.color(LapceColor::LAPCE_BORDER))
.background(config.color(LapceColor::PANEL_BACKGROUND))
Expand Down Expand Up @@ -1723,15 +1764,16 @@ fn split_list(
let editor_tab_data = editor_tabs
.with_untracked(|tabs| tabs.get(editor_tab_id).cloned());
if let Some(editor_tab_data) = editor_tab_data {
container(editor_tab(
editor_tab(
window_tab_data.clone(),
plugin.clone(),
active_editor_tab,
editor_tab_data,
dragging,
))
)
.into_any()
} else {
container(text("empty editor tab"))
text("empty editor tab").into_any()
}
}
SplitContent::Split(split_id) => {
Expand All @@ -1744,8 +1786,9 @@ fn split_list(
plugin.clone(),
dragging,
)
.into_any()
} else {
container(text("empty split"))
text("empty split").into_any()
}
}
};
Expand Down
Loading