Skip to content

prepare for window resizing #1185

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

Closed
wants to merge 1 commit into from
Closed

prepare for window resizing #1185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions helix-view/src/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pub enum Direction {
pub struct Container {
layout: Layout,
children: Vec<ViewId>,
child_weights: Option<Vec<f32>>,
area: Rect,
}

Expand All @@ -74,6 +75,7 @@ impl Container {
Self {
layout,
children: Vec::new(),
child_weights: None,
area: Rect::default(),
}
}
Expand Down Expand Up @@ -134,6 +136,9 @@ impl Tree {
};

container.children.insert(pos, node);
if let Some(ws) = container.child_weights.as_mut() {
ws.insert(pos, 1f32);
}
// focus the new node
self.focus = node;

Expand Down Expand Up @@ -171,6 +176,9 @@ impl Tree {
pos + 1
};
container.children.insert(pos, node);
if let Some(ws) = container.child_weights.as_mut() {
ws.insert(pos, 1f32);
}
self.nodes[node].parent = parent;
} else {
let mut split = Node::container(layout);
Expand Down Expand Up @@ -235,6 +243,9 @@ impl Tree {
{
if let Some(pos) = container.children.iter().position(|&child| child == index) {
container.children.remove(pos);
if let Some(ws) = container.child_weights.as_mut() {
ws.remove(pos);
}

// TODO: if container now only has one child, remove it and place child in parent
if container.children.is_empty() && parent_id != self.root {
Expand Down Expand Up @@ -342,12 +353,16 @@ impl Tree {
match container.layout {
Layout::Horizontal => {
let len = container.children.len();

let height = area.height / len as u16;

let weights = container
.child_weights
.clone()
.unwrap_or_else(|| vec![1f32; len]);
let step = container.area.height as f32 / weights.iter().sum::<f32>();
let mut child_y = area.y;

for (i, child) in container.children.iter().enumerate() {
let height = (step * weights[i]) as u16;

let mut area = Rect::new(
container.area.x,
child_y,
Expand All @@ -367,15 +382,20 @@ impl Tree {
}
Layout::Vertical => {
let len = container.children.len();

let width = area.width / len as u16;
let weights = container
.child_weights
.clone()
.unwrap_or_else(|| vec![1f32; len]);
let step = container.area.width as f32 / weights.iter().sum::<f32>();

let inner_gap = 1u16;
// let total_gap = inner_gap * (len as u16 - 1);

let mut child_x = area.x;

for (i, child) in container.children.iter().enumerate() {
let width = (step * weights[i]) as u16;

let mut area = Rect::new(
child_x,
container.area.y,
Expand Down