8e8367e · helix · git.iko.soy

helix-term/src/commands/lsp.rs+2−4

compare with master

unifiedsplit

@@ -287,10 +287,8 @@ pub fn code_action(cx: &mut Context) {

287 });

288 picker.move_down(); // pre-select the first item

289

290+ let popup =

290− let popup = Popup::new("code-action", picker).margin(helix_view::graphics::Margin {

291+ Popup::new("code-action", picker).margin(helix_view::graphics::Margin::all(1));

291− vertical: 1,

292− horizontal: 1,

293− });

294 compositor.replace_or_push("code-action", popup);

292 compositor.replace_or_push("code-action", popup);

295 },

293 },

296 )

294 )

helix-term/src/ui/info.rs+1−4

@@ -27,10 +27,7 @@ impl Component for Info {

27 .borders(Borders::ALL)

28 .border_style(popup_style);

29

30− let margin = Margin {

30+ let margin = Margin::horizontal(1);

31− vertical: 0,

32− horizontal: 1,

33− };

34 let inner = block.inner(area).inner(&margin);

31 let inner = block.inner(area).inner(&margin);

35 block.render(area, surface);

32 block.render(area, surface);

36

33

helix-term/src/ui/markdown.rs+1−4

@@ -323,10 +323,7 @@ impl Component for Markdown {

323 .wrap(Wrap { trim: false })

324 .scroll((cx.scroll.unwrap_or_default() as u16, 0));

325

326− let margin = Margin {

326+ let margin = Margin::all(1);

327− vertical: 1,

328− horizontal: 1,

329− };

330 par.render(area.inner(&margin), surface);

327 par.render(area.inner(&margin), surface);

331 }

328 }

332

329

helix-term/src/ui/picker.rs+1−4

@@ -200,10 +200,7 @@ impl<T: 'static> Component for FilePicker<T> {

200 // calculate the inner area inside the box

201 let inner = block.inner(preview_area);

202 // 1 column gap on either side

203− let margin = Margin {

203+ let margin = Margin::horizontal(1);

204− vertical: 0,

205− horizontal: 1,

206− };

207 let inner = inner.inner(&margin);

204 let inner = inner.inner(&margin);

208 block.render(preview_area, surface);

205 block.render(preview_area, surface);

209

206

helix-term/src/ui/popup.rs+3−6

@@ -27,10 +27,7 @@ impl<T: Component> Popup<T> {

27 Self {

28 contents,

29 position: None,

30− margin: Margin {

30+ margin: Margin::none(),

31− vertical: 0,

32− horizontal: 0,

33− },

34 size: (0, 0),

31 size: (0, 0),

35 child_size: (0, 0),

32 child_size: (0, 0),

36 scroll: 0,

33 scroll: 0,

@@ -163,8 +160,8 @@ impl<T: Component> Component for Popup<T> {

163

160

164 self.child_size = (width, height);

161 self.child_size = (width, height);

165 self.size = (

162 self.size = (

166− (width + self.margin.horizontal * 2).min(max_width),

163+ (width + self.margin.width()).min(max_width),

167− (height + self.margin.vertical * 2).min(max_height),

164+ (height + self.margin.height()).min(max_height),

168 );

165 );

169

166

170 // re-clamp scroll offset

167 // re-clamp scroll offset

helix-term/src/ui/prompt.rs+1−4

@@ -430,10 +430,7 @@ impl Prompt {

430 .borders(Borders::ALL)

431 .border_style(background);

432

433− let inner = block.inner(area).inner(&Margin {

433+ let inner = block.inner(area).inner(&Margin::horizontal(1));

434− vertical: 0,

435− horizontal: 1,

436− });

437

434

438 block.render(area, surface);

435 block.render(area, surface);

439 text.render(inner, surface, cx);

436 text.render(inner, surface, cx);

helix-tui/src/layout.rs+6−10

@@ -68,10 +68,7 @@ impl Default for Layout {

68 fn default() -> Layout {

69 Layout {

70 direction: Direction::Vertical,

71− margin: Margin {

71+ margin: Margin::none(),

72− horizontal: 0,

73− vertical: 0,

74− },

75 constraints: Vec::new(),

72 constraints: Vec::new(),

76 }

73 }

77 }

74 }

@@ -87,20 +84,19 @@ impl Layout {

87 }

84 }

88

85

89 pub fn margin(mut self, margin: u16) -> Layout {

86 pub fn margin(mut self, margin: u16) -> Layout {

90− self.margin = Margin {

87+ self.margin = Margin::all(margin);

91− horizontal: margin,

92− vertical: margin,

93− };

94 self

88 self

95 }

89 }

96

90

97 pub fn horizontal_margin(mut self, horizontal: u16) -> Layout {

91 pub fn horizontal_margin(mut self, horizontal: u16) -> Layout {

98− self.margin.horizontal = horizontal;

92+ self.margin.left = horizontal;

93+ self.margin.right = horizontal;

99 self

94 self

100 }

95 }

101

96

102 pub fn vertical_margin(mut self, vertical: u16) -> Layout {

97 pub fn vertical_margin(mut self, vertical: u16) -> Layout {

103− self.margin.vertical = vertical;

98+ self.margin.top = vertical;

99+ self.margin.bottom = vertical;

104 self

100 self

105 }

101 }

106

102

helix-view/src/graphics.rs+60−7

@@ -27,8 +27,61 @@ impl Default for CursorKind {

27

28#[derive(Debug, Clone, PartialEq, Eq, Hash)]

29pub struct Margin {

30+ pub left: u16,

31+ pub right: u16,

32+ pub top: u16,

33+ pub bottom: u16,

34+}

35+

36+impl Margin {

37+ pub fn none() -> Self {

38+ Self {

39+ left: 0,

40+ right: 0,

41+ top: 0,

42+ bottom: 0,

43+ }

44+ }

45+

46+ /// Set uniform margin for all sides.

47+ pub fn all(value: u16) -> Self {

48+ Self {

49+ left: value,

50+ right: value,

51+ top: value,

52+ bottom: value,

53+ }

54+ }

55+

56+ /// Set the margin of left and right sides to specified value.

57+ pub fn horizontal(value: u16) -> Self {

58+ Self {

59+ left: value,

60+ right: value,

61+ top: 0,

62+ bottom: 0,

63+ }

64+ }

65+

66+ /// Set the margin of top and bottom sides to specified value.

30− pub vertical: u16,

67+ pub fn vertical(value: u16) -> Self {

31− pub horizontal: u16,

68+ Self {

69+ left: 0,

70+ right: 0,

71+ top: value,

72+ bottom: value,

73+ }

74+ }

75+

76+ /// Get the total width of the margin (left + right)

77+ pub fn width(&self) -> u16 {

78+ self.left + self.right

79+ }

80+

81+ /// Get the total height of the margin (top + bottom)

82+ pub fn height(&self) -> u16 {

83+ self.top + self.bottom

84+ }

32}

85}

33

86

34/// A simple rectangle used in the computation of the layout and to give widgets an hint about the

87/// A simple rectangle used in the computation of the layout and to give widgets an hint about the

@@ -141,14 +194,14 @@ impl Rect {

141 }

194 }

142

195

143 pub fn inner(self, margin: &Margin) -> Rect {

196 pub fn inner(self, margin: &Margin) -> Rect {

144− if self.width < 2 * margin.horizontal || self.height < 2 * margin.vertical {

197+ if self.width < margin.width() || self.height < margin.height() {

145 Rect::default()

198 Rect::default()

146 } else {

199 } else {

147 Rect {

200 Rect {

148− x: self.x + margin.horizontal,

201+ x: self.x + margin.left,

149− y: self.y + margin.vertical,

202+ y: self.y + margin.top,

150− width: self.width - 2 * margin.horizontal,

203+ width: self.width - margin.width(),

151− height: self.height - 2 * margin.vertical,

204+ height: self.height - margin.height(),

152 }

205 }

153 }

206 }

154 }

207 }