From 41f1f85b5f5334ea03a617767442d4404dd7fba7 Mon Sep 17 00:00:00 2001 From: Fabian Gruber Date: Sun, 11 Aug 2024 19:41:48 +0200 Subject: [PATCH] feat: added rounded-corners option to draw rounded borders --- book/src/editor.md | 1 + helix-term/src/ui/completion.rs | 14 +++++++++++--- helix-term/src/ui/info.rs | 6 ++++-- helix-term/src/ui/picker.rs | 14 ++++++++------ helix-term/src/ui/popup.rs | 5 +++-- helix-term/src/ui/prompt.rs | 6 ++++-- helix-tui/src/widgets/block.rs | 8 ++++++++ helix-view/src/editor.rs | 3 +++ 8 files changed, 42 insertions(+), 15 deletions(-) diff --git a/book/src/editor.md b/book/src/editor.md index c2a7af764..fe7478fb5 100644 --- a/book/src/editor.md +++ b/book/src/editor.md @@ -56,6 +56,7 @@ | `trim-final-newlines` | Whether to automatically remove line-endings after the final one on write | `false` | | `trim-trailing-whitespace` | Whether to automatically remove whitespace preceding line endings on write | `false` | | `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` | +| `rounded-corners` | Set to `true` to draw rounded border corners | `false` | | `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid` | `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | `"abcdefghijklmnopqrstuvwxyz"` | `end-of-line-diagnostics` | Minimum severity of diagnostics to render at the end of the line. Set to `disable` to disable entirely. Refer to the setting about `inline-diagnostics` for more details | "disable" diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index e17762bfc..cb980b961 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -20,8 +20,11 @@ use nucleo::{ pattern::{Atom, AtomKind, CaseMatching, Normalization}, Config, Utf32Str, }; -use tui::text::Spans; -use tui::{buffer::Buffer as Surface, text::Span}; +use tui::{ + buffer::Buffer as Surface, + text::{Span, Spans}, + widgets::BorderType, +}; use std::cmp::Reverse; @@ -573,7 +576,12 @@ impl Component for Completion { if cx.editor.popup_border() { use tui::widgets::{Block, Widget}; - Widget::render(Block::bordered(), doc_area, surface); + let border_type = BorderType::new(cx.editor.config().rounded_corners); + Widget::render( + Block::bordered().border_type(border_type), + doc_area, + surface, + ); } markdown_doc.render(doc_area, surface, cx); diff --git a/helix-term/src/ui/info.rs b/helix-term/src/ui/info.rs index 1cac7c86c..9083b6f1d 100644 --- a/helix-term/src/ui/info.rs +++ b/helix-term/src/ui/info.rs @@ -3,7 +3,7 @@ use helix_view::graphics::{Margin, Rect}; use helix_view::info::Info; use tui::buffer::Buffer as Surface; use tui::text::Text; -use tui::widgets::{Block, Paragraph, Widget}; +use tui::widgets::{Block, BorderType, Paragraph, Widget}; impl Component for Info { fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) { @@ -23,9 +23,11 @@ impl Component for Info { )); surface.clear_with(area, popup_style); + let border_type = BorderType::new(cx.editor.config().rounded_corners); let block = Block::bordered() .title(self.title.as_ref()) - .border_style(popup_style); + .border_style(popup_style) + .border_type(border_type); let margin = Margin::horizontal(1); let inner = block.inner(area).inner(margin); diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs index 7abdfce84..25472dcfb 100644 --- a/helix-term/src/ui/picker.rs +++ b/helix-term/src/ui/picker.rs @@ -681,12 +681,13 @@ impl Picker { let background = cx.editor.theme.get("ui.background"); surface.clear_with(area, background); - const BLOCK: Block<'_> = Block::bordered(); + let border_type = BorderType::new(cx.editor.config().rounded_corners); + let block: Block<'_> = Block::bordered().border_type(border_type); // calculate the inner area inside the box - let inner = BLOCK.inner(area); + let inner = block.inner(area); - BLOCK.render(area, surface); + block.render(area, surface); // -- Render the input bar: @@ -870,14 +871,15 @@ impl Picker { let directory = cx.editor.theme.get("ui.text.directory"); surface.clear_with(area, background); - const BLOCK: Block<'_> = Block::bordered(); + let border_type = BorderType::new(cx.editor.config().rounded_corners); + let block: Block<'_> = Block::bordered().border_type(border_type); // calculate the inner area inside the box - let inner = BLOCK.inner(area); + let inner = block.inner(area); // 1 column gap on either side let margin = Margin::horizontal(1); let inner = inner.inner(margin); - BLOCK.render(area, surface); + block.render(area, surface); if let Some((preview, range)) = self.get_preview(cx.editor) { let doc = match preview.document() { diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs index db77492db..dd31385bd 100644 --- a/helix-term/src/ui/popup.rs +++ b/helix-term/src/ui/popup.rs @@ -5,7 +5,7 @@ use crate::{ }; use tui::{ buffer::Buffer as Surface, - widgets::{Block, Widget}, + widgets::{Block, BorderType, Widget}, }; use helix_core::Position; @@ -323,8 +323,9 @@ impl Component for Popup { let mut inner = area; if render_borders { + let border_type = BorderType::new(cx.editor.config().rounded_corners); inner = area.inner(Margin::all(1)); - Widget::render(Block::bordered(), area, surface); + Widget::render(Block::bordered().border_type(border_type), area, surface); } let border = usize::from(render_borders); diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs index ee5c46e76..2cb333372 100644 --- a/helix-term/src/ui/prompt.rs +++ b/helix-term/src/ui/prompt.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use std::{borrow::Cow, ops::RangeFrom}; use tui::buffer::Buffer as Surface; use tui::text::Span; -use tui::widgets::{Block, Widget}; +use tui::widgets::{Block, BorderType, Widget}; use helix_core::{ unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position, @@ -494,9 +494,11 @@ impl Prompt { let background = theme.get("ui.help"); surface.clear_with(area, background); + let border_type = BorderType::new(cx.editor.config().rounded_corners); let block = Block::bordered() // .title(self.title.as_str()) - .border_style(background); + .border_style(background) + .border_type(border_type); let inner = block.inner(area).inner(Margin::horizontal(1)); diff --git a/helix-tui/src/widgets/block.rs b/helix-tui/src/widgets/block.rs index ee7aa7573..dacc814e7 100644 --- a/helix-tui/src/widgets/block.rs +++ b/helix-tui/src/widgets/block.rs @@ -17,6 +17,14 @@ pub enum BorderType { } impl BorderType { + pub fn new(rounded: bool) -> Self { + if rounded { + Self::Rounded + } else { + Self::default() + } + } + pub fn line_symbols(border_type: Self) -> line::Set { match border_type { Self::Plain => line::NORMAL, diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 9aa073fcf..32f0485b1 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -356,6 +356,8 @@ pub struct Config { pub smart_tab: Option, /// Draw border around popups. pub popup_border: PopupBorderConfig, + /// Draw rounded border corners + pub rounded_corners: bool, /// Which indent heuristic to use when a new line is inserted #[serde(default)] pub indent_heuristic: IndentationHeuristic, @@ -1018,6 +1020,7 @@ impl Default for Config { trim_trailing_whitespace: false, smart_tab: Some(SmartTabConfig::default()), popup_border: PopupBorderConfig::None, + rounded_corners: false, indent_heuristic: IndentationHeuristic::default(), jump_label_alphabet: ('a'..='z').collect(), inline_diagnostics: InlineDiagnosticsConfig::default(),