simplifys implementation & removes palette dependency.

helix-term/src/ui/editor.rs

@@ -161,8 +161,8 @@ impl EditorView {
  self.render_statusline(doc, view, statusline_area, surface, theme, is_focused);
 
  if !is_focused {
- if let Some(op) = &editor.config().dim.unfocused_views {
- surface.dim(area, op);
+ if let Some(shade) = editor.config().dim.unfocused_views {
+ surface.dim(area, shade);
  }
  }
  }

helix-term/src/ui/overlay.rs

@@ -45,9 +45,9 @@ fn clip_rect_relative(rect: Rect, percent_horizontal: u8, percent_vertical: u8)
 
 impl<T: Component + 'static> Component for Overlay<T> {
  fn render(&mut self, area: Rect, frame: &mut Buffer, ctx: &mut Context) {
- if let Some(op) = &ctx.editor.config().dim.overlay_backdrops {
+ if let Some(shade) = ctx.editor.config().dim.overlay_backdrops {
  // TODO: optimise. we don't need to dim behind the child content
- frame.dim(area, op);
+ frame.dim(area, shade);
  }
  let dimensions = (self.calc_child_size)(area);
  self.content.render(dimensions, frame, ctx)

helix-tui/Cargo.toml

@@ -16,7 +16,6 @@ include = ["src/**/*", "README.md"]
 default = ["crossterm"]
 
 [dependencies]
-palette = "0.6"
 bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.9"

helix-tui/src/buffer.rs

@@ -1,7 +1,6 @@
 use crate::text::{Span, Spans};
 use helix_core::unicode::width::UnicodeWidthStr;
-use helix_view::graphics::{Color, DimFunction, DimOperation, Modifier, Rect, Style};
-use palette::Shade;
+use helix_view::graphics::{Color, Modifier, Rect, Style};
 use std::cmp::min;
 use std::collections::HashMap;
 use unicode_segmentation::UnicodeSegmentation;
@@ -585,26 +584,26 @@ impl Buffer {
  updates
  }
 
- /// Apply DimOperation to all cells in area
- pub fn dim(&mut self, area: Rect, op: &DimOperation) {
- use DimFunction::*;
-
- type Srgb8 = palette::rgb::Rgb<palette::encoding::Srgb, u8>;
+ /// Apply shade to all cells in area.
+ ///
+ /// shade = 0 -> set text modifier DIM
+ /// shade < 0 -> darken rgb color
+ /// shade > 0 -> lighten rgb color
+ pub fn dim(&mut self, area: Rect, shade: i8) {
+ let shade_amount = shade.unsigned_abs().saturating_mul(2);
+ let shade_fn = if shade < 0 {
+ u8::saturating_sub
+ } else {
+ u8::saturating_add
+ };
+ // TODO: replace with saturating_add_signed when mixed_integer_ops (https://github.com/rust-lang/rust/issues/87840) get stabilized.
+ let shaded = |v| shade_fn(v, shade_amount);
 
  let mut cache: HashMap<Color, Color> = HashMap::new();
- let intensity = op.intensity as f32 / 100.0; // TODO: clamp
-
  let mut modify = |col| {
  let result = cache.entry(col).or_insert_with(|| {
  if let Color::Rgb(r, g, b) = col {
- let mut rgb = Srgb8::new(r, g, b).into_format().into_linear();
- rgb = match op.func {
- Lighten => rgb.lighten(intensity),
- Darken => rgb.darken(intensity),
- _ => unimplemented!(),
- };
- let rgb = Srgb8::from(rgb).into_components();
- Color::Rgb(rgb.0, rgb.1, rgb.2)
+ Color::Rgb(shaded(r), shaded(g), shaded(b))
  } else {
  col
  }
@@ -615,17 +614,14 @@ impl Buffer {
  for x in area.left()..area.right() {
  let cell = &mut self[(x, y)];
 
- match op.func {
- Dim => {
- cell.modifier.insert(Modifier::DIM);
- }
- Lighten | Darken => {
- if let Color::Rgb(..) = cell.fg {
- cell.fg = modify(cell.fg);
- };
- if let Color::Rgb(..) = cell.bg {
- cell.bg = modify(cell.bg);
- }
+ if shade == 0 {
+ cell.modifier.insert(Modifier::DIM);
+ } else {
+ if let Color::Rgb(..) = cell.fg {
+ cell.fg = modify(cell.fg);
+ };
+ if let Color::Rgb(..) = cell.bg {
+ cell.bg = modify(cell.bg);
  }
  }
  }

helix-view/src/editor.rs

@@ -1,7 +1,7 @@
 use crate::{
  clipboard::{get_clipboard_provider, ClipboardProvider},
  document::{Mode, SCRATCH_BUFFER_NAME},
- graphics::{CursorKind, DimOperation, Rect},
+ graphics::{CursorKind, Rect},
  info::Info,
  input::KeyEvent,
  theme::{self, Theme},
@@ -107,10 +107,10 @@ impl Default for FilePickerConfig {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct DimConfig {
- /// dim function for margin around content of dimmable overlays
- pub overlay_backdrops: Option<DimOperation>,
- /// dim function for unfocused editor views
- pub unfocused_views: Option<DimOperation>,
+ /// shade for margin around content of overlays
+ pub overlay_backdrops: Option<i8>,
+ /// shade for unfocused editor views
+ pub unfocused_views: Option<i8>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

helix-view/src/graphics.rs

@@ -5,35 +5,6 @@ use std::{
  str::FromStr,
 };
 
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub enum DimFunction {
- // Set text modifier DIM
- Dim,
- // Lighten the shade of an RGB color
- Lighten,
- // Darken the shade of an RGB color
- Darken,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
-pub struct DimOperation {
- /// Function to perform on cells
- pub func: DimFunction,
- /// 0-100 Instensity of the applied function. Has no effect with DimFunction.Dim
- pub intensity: u8,
-}
-
-impl Default for DimOperation {
- fn default() -> Self {
- Self {
- func: DimFunction::Darken,
- intensity: 50,
- }
- }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Deserialize, Serialize)]
 #[serde(rename_all = "lowercase")]
 /// UNSTABLE