52da68e · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Render a separator between vertical splits.

52da68eBlaž Hrastnik6 years ago

helix-term/src/ui/editor.rs+27−9

compare with master

unifiedsplit

@@ -55,13 +55,26 @@ impl EditorView {

55 is_focused: bool,

56 ) {

57 let area = Rect::new(

58− viewport.x + OFFSET,

58+ view.area.x + OFFSET,

59− viewport.y,

59+ view.area.y,

60− viewport.width - OFFSET,

60+ view.area.width - OFFSET,

61− viewport.height.saturating_sub(1),

61+ view.area.height.saturating_sub(1),

62 ); // - 1 for statusline

63 self.render_buffer(doc, view, area, surface, theme, is_focused);

65+ // if we're not at the edge of the screen, draw a right border

66+ if viewport.right() != view.area.right() {

67+ let x = area.right();

68+ let border_style = theme.get("ui.window");

69+ for y in area.top()..area.bottom() {

70+ surface

71+ .get_mut(x, y)

72+ // .set_symbol(tui::symbols::line::VERTICAL)

73+ .set_symbol(" ")

74+ .set_style(border_style);

75+ }

76+ }

77+

65 // clear with background color

78 // clear with background color

66 // TODO: this seems to prevent setting style later

79 // TODO: this seems to prevent setting style later

67 // surface.set_style(viewport, theme.get("ui.background"));

80 // surface.set_style(viewport, theme.get("ui.background"));

@@ -69,9 +82,9 @@ impl EditorView {

69 self.render_diagnostics(doc, view, area, surface, theme, is_focused);

82 self.render_diagnostics(doc, view, area, surface, theme, is_focused);

71 let area = Rect::new(

84 let area = Rect::new(

72− viewport.x,

85+ view.area.x,

73− viewport.y + viewport.height.saturating_sub(1),

86+ view.area.y + view.area.height.saturating_sub(1),

74− viewport.width,

87+ view.area.width,

75 1,

88 1,

76 );

89 );

77 self.render_statusline(doc, area, surface, theme, is_focused);

90 self.render_statusline(doc, area, surface, theme, is_focused);

@@ -79,7 +92,12 @@ impl EditorView {

79 // render status

92 // render status

80 if let Some(status_msg) = &self.status_msg {

93 if let Some(status_msg) = &self.status_msg {

81 let style = Style::default().fg(Color::Rgb(164, 160, 232)); // lavender

94 let style = Style::default().fg(Color::Rgb(164, 160, 232)); // lavender

82− surface.set_string(viewport.x, viewport.y + viewport.height, status_msg, style);

95+ surface.set_string(

96+ view.area.x,

97+ view.area.y + view.area.height,

98+ status_msg,

99+ style,

100+ );

83 }

101 }

84 }

102 }

103

@@ -595,7 +613,7 @@ impl Component for EditorView {

595 fn render(&self, mut area: Rect, surface: &mut Surface, cx: &mut Context) {

613 fn render(&self, mut area: Rect, surface: &mut Surface, cx: &mut Context) {

596 for (view, is_focused) in cx.editor.tree.views() {

614 for (view, is_focused) in cx.editor.tree.views() {

597 let doc = cx.editor.document(view.doc).unwrap();

615 let doc = cx.editor.document(view.doc).unwrap();

598− self.render_view(doc, view, view.area, surface, &cx.editor.theme, is_focused);

616+ self.render_view(doc, view, area, surface, &cx.editor.theme, is_focused);

599 }

617 }

600

618

601 if let Some(completion) = &self.completion {

619 if let Some(completion) = &self.completion {

helix-view/src/tree.rs+4−1

@@ -353,6 +353,9 @@ impl Tree {

353

354 let width = area.width / len as u16;

355

356+ let inner_gap = 1u16;

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

358+

356 let mut child_x = area.x;

359 let mut child_x = area.x;

357

360

358 for (i, child) in container.children.iter().enumerate() {

361 for (i, child) in container.children.iter().enumerate() {

@@ -362,7 +365,7 @@ impl Tree {

362 width,

365 width,

363 container.area.height,

366 container.area.height,

364 );

367 );

365− child_x += width;

368+ child_x += width + inner_gap;

366

369

367 // last child takes the remaining width because we can get uneven

370 // last child takes the remaining width because we can get uneven

368 // space from rounding

371 // space from rounding

theme.toml+1

@@ -39,6 +39,7 @@

39"ui.linenr" = { fg = "#5a5977" } # comet

40"ui.statusline" = { bg = "#281733" } # revolver

41"ui.popup" = { bg = "#281733" } # revolver

42+"ui.window" = { bg = "#452859" } # bossa nova

43"warning" = "#ffcd1c"

44"warning" = "#ffcd1c"

44"error" = "#f47868"

45"error" = "#f47868"