Refactor Margin for fine grained control (#2727)

pull/2851/head
Gokul Soumya 2 years ago committed by GitHub
parent ce85b9716d
commit 8e8367eea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -287,10 +287,8 @@ pub fn code_action(cx: &mut Context) {
}); });
picker.move_down(); // pre-select the first item picker.move_down(); // pre-select the first item
let popup = Popup::new("code-action", picker).margin(helix_view::graphics::Margin { let popup =
vertical: 1, Popup::new("code-action", picker).margin(helix_view::graphics::Margin::all(1));
horizontal: 1,
});
compositor.replace_or_push("code-action", popup); compositor.replace_or_push("code-action", popup);
}, },
) )

@ -27,10 +27,7 @@ impl Component for Info {
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(popup_style); .border_style(popup_style);
let margin = Margin { let margin = Margin::horizontal(1);
vertical: 0,
horizontal: 1,
};
let inner = block.inner(area).inner(&margin); let inner = block.inner(area).inner(&margin);
block.render(area, surface); block.render(area, surface);

@ -323,10 +323,7 @@ impl Component for Markdown {
.wrap(Wrap { trim: false }) .wrap(Wrap { trim: false })
.scroll((cx.scroll.unwrap_or_default() as u16, 0)); .scroll((cx.scroll.unwrap_or_default() as u16, 0));
let margin = Margin { let margin = Margin::all(1);
vertical: 1,
horizontal: 1,
};
par.render(area.inner(&margin), surface); par.render(area.inner(&margin), surface);
} }

@ -200,10 +200,7 @@ impl<T: 'static> Component for FilePicker<T> {
// calculate the inner area inside the box // calculate the inner area inside the box
let inner = block.inner(preview_area); let inner = block.inner(preview_area);
// 1 column gap on either side // 1 column gap on either side
let margin = Margin { let margin = Margin::horizontal(1);
vertical: 0,
horizontal: 1,
};
let inner = inner.inner(&margin); let inner = inner.inner(&margin);
block.render(preview_area, surface); block.render(preview_area, surface);

@ -27,10 +27,7 @@ impl<T: Component> Popup<T> {
Self { Self {
contents, contents,
position: None, position: None,
margin: Margin { margin: Margin::none(),
vertical: 0,
horizontal: 0,
},
size: (0, 0), size: (0, 0),
child_size: (0, 0), child_size: (0, 0),
scroll: 0, scroll: 0,
@ -163,8 +160,8 @@ impl<T: Component> Component for Popup<T> {
self.child_size = (width, height); self.child_size = (width, height);
self.size = ( self.size = (
(width + self.margin.horizontal * 2).min(max_width), (width + self.margin.width()).min(max_width),
(height + self.margin.vertical * 2).min(max_height), (height + self.margin.height()).min(max_height),
); );
// re-clamp scroll offset // re-clamp scroll offset

@ -430,10 +430,7 @@ impl Prompt {
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(background); .border_style(background);
let inner = block.inner(area).inner(&Margin { let inner = block.inner(area).inner(&Margin::horizontal(1));
vertical: 0,
horizontal: 1,
});
block.render(area, surface); block.render(area, surface);
text.render(inner, surface, cx); text.render(inner, surface, cx);

@ -68,10 +68,7 @@ impl Default for Layout {
fn default() -> Layout { fn default() -> Layout {
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
margin: Margin { margin: Margin::none(),
horizontal: 0,
vertical: 0,
},
constraints: Vec::new(), constraints: Vec::new(),
} }
} }
@ -87,20 +84,19 @@ impl Layout {
} }
pub fn margin(mut self, margin: u16) -> Layout { pub fn margin(mut self, margin: u16) -> Layout {
self.margin = Margin { self.margin = Margin::all(margin);
horizontal: margin,
vertical: margin,
};
self self
} }
pub fn horizontal_margin(mut self, horizontal: u16) -> Layout { pub fn horizontal_margin(mut self, horizontal: u16) -> Layout {
self.margin.horizontal = horizontal; self.margin.left = horizontal;
self.margin.right = horizontal;
self self
} }
pub fn vertical_margin(mut self, vertical: u16) -> Layout { pub fn vertical_margin(mut self, vertical: u16) -> Layout {
self.margin.vertical = vertical; self.margin.top = vertical;
self.margin.bottom = vertical;
self self
} }

@ -27,8 +27,61 @@ impl Default for CursorKind {
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Margin { pub struct Margin {
pub vertical: u16, pub left: u16,
pub horizontal: u16, pub right: u16,
pub top: u16,
pub bottom: u16,
}
impl Margin {
pub fn none() -> Self {
Self {
left: 0,
right: 0,
top: 0,
bottom: 0,
}
}
/// Set uniform margin for all sides.
pub fn all(value: u16) -> Self {
Self {
left: value,
right: value,
top: value,
bottom: value,
}
}
/// Set the margin of left and right sides to specified value.
pub fn horizontal(value: u16) -> Self {
Self {
left: value,
right: value,
top: 0,
bottom: 0,
}
}
/// Set the margin of top and bottom sides to specified value.
pub fn vertical(value: u16) -> Self {
Self {
left: 0,
right: 0,
top: value,
bottom: value,
}
}
/// Get the total width of the margin (left + right)
pub fn width(&self) -> u16 {
self.left + self.right
}
/// Get the total height of the margin (top + bottom)
pub fn height(&self) -> u16 {
self.top + self.bottom
}
} }
/// A simple rectangle used in the computation of the layout and to give widgets an hint about the /// A simple rectangle used in the computation of the layout and to give widgets an hint about the
@ -141,14 +194,14 @@ impl Rect {
} }
pub fn inner(self, margin: &Margin) -> Rect { pub fn inner(self, margin: &Margin) -> Rect {
if self.width < 2 * margin.horizontal || self.height < 2 * margin.vertical { if self.width < margin.width() || self.height < margin.height() {
Rect::default() Rect::default()
} else { } else {
Rect { Rect {
x: self.x + margin.horizontal, x: self.x + margin.left,
y: self.y + margin.vertical, y: self.y + margin.top,
width: self.width - 2 * margin.horizontal, width: self.width - margin.width(),
height: self.height - 2 * margin.vertical, height: self.height - margin.height(),
} }
} }
} }

Loading…
Cancel
Save