mirror of https://github.com/sgoudham/neovide.git
progress toward refactor
keith
4 years ago
parent
494f9a395c
commit
4fd863ca2c
@ -0,0 +1,234 @@
|
||||
use skulpin::skia_safe::gpu::SurfaceOrigin;
|
||||
use skulpin::skia_safe::{
|
||||
Budgeted, Canvas, ImageInfo, Rect, Surface, Point, image_filters::blur
|
||||
};
|
||||
use skulpin::skia_safe::canvas::{
|
||||
SaveLayerRec,
|
||||
SrcRectConstraint
|
||||
};
|
||||
|
||||
use super::{Renderer, RendererSettings};
|
||||
use super::animation_utils::*;
|
||||
use crate::editor::WindowDrawCommand;
|
||||
use crate::redraw_scheduler::REDRAW_SCHEDULER;
|
||||
|
||||
fn build_window_surface(
|
||||
parent_canvas: &mut Canvas,
|
||||
renderer: &Renderer,
|
||||
grid_width: u64,
|
||||
grid_height: u64,
|
||||
) -> Surface {
|
||||
let dimensions = ((grid_width as f32 * renderer.font_width) as i32, (grid_height as f32 * renderer.font_height) as i32);
|
||||
let mut context = parent_canvas.gpu_context().unwrap();
|
||||
let budgeted = Budgeted::Yes;
|
||||
let parent_image_info = parent_canvas.image_info();
|
||||
let image_info = ImageInfo::new(
|
||||
dimensions,
|
||||
parent_image_info.color_type(),
|
||||
parent_image_info.alpha_type(),
|
||||
parent_image_info.color_space(),
|
||||
);
|
||||
let surface_origin = SurfaceOrigin::TopLeft;
|
||||
let mut surface = Surface::new_render_target(
|
||||
&mut context,
|
||||
budgeted,
|
||||
&image_info,
|
||||
None,
|
||||
surface_origin,
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.expect("Could not create surface");
|
||||
let canvas = surface.canvas();
|
||||
canvas.clear(renderer.default_style.colors.background.clone().unwrap().to_color());
|
||||
surface
|
||||
}
|
||||
|
||||
pub struct RenderedWindow {
|
||||
surface: Surface,
|
||||
pub id: u64,
|
||||
pub hidden: bool,
|
||||
pub floating: bool,
|
||||
|
||||
grid_width: u64, grid_height: u64,
|
||||
|
||||
grid_start_position: Point,
|
||||
grid_current_position: Point,
|
||||
grid_destination: Point,
|
||||
t: f32
|
||||
}
|
||||
|
||||
impl RenderedWindow {
|
||||
pub fn new(parent_canvas: &mut Canvas, renderer: &Renderer, id: u64, grid_position: Point, grid_width: u64, grid_height: u64) -> RenderedWindow {
|
||||
let surface = build_window_surface(parent_canvas, renderer, grid_width, grid_height);
|
||||
|
||||
RenderedWindow {
|
||||
surface,
|
||||
id,
|
||||
hidden: false,
|
||||
floating: false,
|
||||
|
||||
grid_width,
|
||||
grid_height,
|
||||
|
||||
grid_start_position: grid_position,
|
||||
grid_current_position: grid_position,
|
||||
grid_destination: grid_position,
|
||||
t: 2.0 // 2.0 is out of the 0.0 to 1.0 range and stops animation
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update(
|
||||
&mut self,
|
||||
settings: &RendererSettings,
|
||||
dt: f32
|
||||
) -> bool {
|
||||
if (self.t - 1.0).abs() < std::f32::EPSILON {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (self.t - 1.0).abs() < std::f32::EPSILON {
|
||||
// We are at destination, move t out of 0-1 range to stop the animation
|
||||
self.t = 2.0;
|
||||
} else {
|
||||
self.t = (self.t + dt / settings.animation_length).min(1.0);
|
||||
}
|
||||
|
||||
self.grid_current_position = ease_point(
|
||||
ease_out_expo,
|
||||
self.grid_start_position,
|
||||
self.grid_destination,
|
||||
self.t,
|
||||
);
|
||||
|
||||
true
|
||||
}
|
||||
|
||||
pub fn draw(
|
||||
&mut self,
|
||||
root_canvas: &mut Canvas,
|
||||
settings: &RendererSettings,
|
||||
font_width: f32,
|
||||
font_height: f32,
|
||||
dt: f32
|
||||
) -> (u64, Rect) {
|
||||
let current_pixel_position = Point::new(self.grid_current_position.x * font_width, self.grid_current_position.y * font_height);
|
||||
|
||||
let image_width = (self.grid_width as f32 * font_width) as i32;
|
||||
let image_height = (self.grid_height as f32 * font_height) as i32;
|
||||
|
||||
if self.update(settings, dt) {
|
||||
REDRAW_SCHEDULER.queue_next_frame();
|
||||
}
|
||||
|
||||
root_canvas.save();
|
||||
|
||||
let region = Rect::from_point_and_size(current_pixel_position, (image_width, image_height));
|
||||
root_canvas.clip_rect(®ion, None, Some(false));
|
||||
|
||||
if self.floating && settings.floating_blur {
|
||||
let blur = blur((2.0, 2.0), None, None, None).unwrap();
|
||||
let save_layer_rec = SaveLayerRec::default()
|
||||
.backdrop(&blur)
|
||||
.bounds(®ion);
|
||||
|
||||
root_canvas.save_layer(&save_layer_rec);
|
||||
}
|
||||
|
||||
self.surface.draw(
|
||||
root_canvas.as_mut(),
|
||||
(current_pixel_position.x, current_pixel_position.y),
|
||||
None);
|
||||
|
||||
if self.floating {
|
||||
root_canvas.restore();
|
||||
}
|
||||
|
||||
root_canvas.restore();
|
||||
|
||||
let window_position = current_pixel_position.clone();
|
||||
|
||||
(self.id, Rect::from_point_and_size(window_position, (image_width as f32, image_height as f32)))
|
||||
}
|
||||
|
||||
pub fn handle_window_draw_command(mut self, renderer: &mut Renderer, draw_command: WindowDrawCommand) -> Self {
|
||||
match draw_command {
|
||||
WindowDrawCommand::Position {
|
||||
grid_left, grid_top,
|
||||
width: grid_width,
|
||||
height: grid_height,
|
||||
floating
|
||||
} => {
|
||||
let new_destination: Point = (grid_left as f32, grid_top as f32).into();
|
||||
|
||||
if self.grid_destination != new_destination {
|
||||
self.t = 0.0; // Reset animation as we have a new destination.
|
||||
self.grid_start_position = self.grid_current_position;
|
||||
self.grid_destination = new_destination;
|
||||
}
|
||||
|
||||
if grid_width != self.grid_width || grid_height != self.grid_height {
|
||||
let mut old_surface = self.surface;
|
||||
self.surface = build_window_surface(old_surface.canvas(), &renderer, grid_width, grid_height);
|
||||
old_surface.draw(self.surface.canvas(), (0.0, 0.0), None);
|
||||
self.grid_width = grid_width;
|
||||
self.grid_height = grid_height;
|
||||
}
|
||||
|
||||
self.floating = floating;
|
||||
},
|
||||
WindowDrawCommand::Cell {
|
||||
text, cell_width, window_left, window_top, style
|
||||
} => {
|
||||
let mut canvas = self.surface.canvas();
|
||||
let grid_position = (window_left, window_top);
|
||||
|
||||
renderer.draw_background(
|
||||
&mut canvas,
|
||||
grid_position,
|
||||
cell_width,
|
||||
&style,
|
||||
self.floating,
|
||||
);
|
||||
renderer.draw_foreground(
|
||||
&mut canvas,
|
||||
&text,
|
||||
grid_position,
|
||||
cell_width,
|
||||
&style,
|
||||
);
|
||||
},
|
||||
WindowDrawCommand::Scroll {
|
||||
top, bot, left, right, rows, cols
|
||||
} => {
|
||||
let scrolled_region = Rect::new(
|
||||
left as f32 * renderer.font_width,
|
||||
top as f32 * renderer.font_height,
|
||||
right as f32 * renderer.font_width,
|
||||
bot as f32 * renderer.font_height);
|
||||
|
||||
let snapshot = self.surface.image_snapshot();
|
||||
let canvas = self.surface.canvas();
|
||||
|
||||
canvas.save();
|
||||
canvas.clip_rect(scrolled_region, None, Some(false));
|
||||
|
||||
let mut translated_region = scrolled_region.clone();
|
||||
translated_region.offset((-cols as f32 * renderer.font_width, -rows as f32 * renderer.font_height));
|
||||
|
||||
canvas.draw_image_rect(snapshot, Some((&scrolled_region, SrcRectConstraint::Fast)), translated_region, &renderer.paint);
|
||||
|
||||
canvas.restore();
|
||||
},
|
||||
WindowDrawCommand::Clear => {
|
||||
let canvas = self.surface.canvas();
|
||||
self.surface = build_window_surface(canvas, &renderer, self.grid_width, self.grid_height);
|
||||
},
|
||||
WindowDrawCommand::Show => self.hidden = false,
|
||||
WindowDrawCommand::Hide => self.hidden = true,
|
||||
_ => {}
|
||||
};
|
||||
|
||||
self
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
fn compute_text_region(grid_pos: (u64, u64), cell_width: u64, font_width: f32, font_height: f32) -> Rect {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * font_width;
|
||||
let y = grid_y as f32 * font_height;
|
||||
let width = cell_width as f32 * font_width as f32;
|
||||
let height = font_height as f32;
|
||||
Rect::new(x, y, x + width, y + height)
|
||||
}
|
||||
|
||||
fn draw_background(
|
||||
canvas: &mut Canvas,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
default_style: &Arc<Style>,
|
||||
floating: bool,
|
||||
settings: &RendererSettings
|
||||
) {
|
||||
self.paint.set_blend_mode(BlendMode::Src);
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
let style = style.as_ref().unwrap_or(default_style);
|
||||
|
||||
let mut color = style.background(&default_style.colors);
|
||||
|
||||
if floating {
|
||||
color.a = color.a * settings.floating_opacity.min(1.0).max(0.0);
|
||||
}
|
||||
|
||||
self.paint.set_color(color.to_color());
|
||||
canvas.draw_rect(region, &self.paint);
|
||||
}
|
||||
|
||||
fn draw_foreground(
|
||||
canvas: &mut Canvas,
|
||||
text: &str,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
default_style: &Arc<Style>,
|
||||
) {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * self.font_width;
|
||||
let y = grid_y as f32 * self.font_height;
|
||||
let width = cell_width as f32 * self.font_width;
|
||||
|
||||
let style = style.as_ref().unwrap_or(default_style);
|
||||
|
||||
canvas.save();
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
|
||||
canvas.clip_rect(region, None, Some(false));
|
||||
|
||||
if style.underline || style.undercurl {
|
||||
let line_position = self.shaper.underline_position();
|
||||
let stroke_width = self.shaper.options.size / 10.0;
|
||||
self.paint
|
||||
.set_color(style.special(&default_style.colors).to_color());
|
||||
self.paint.set_stroke_width(stroke_width);
|
||||
|
||||
if style.undercurl {
|
||||
self.paint.set_path_effect(dash_path_effect::new(
|
||||
&[stroke_width * 2.0, stroke_width * 2.0],
|
||||
0.0,
|
||||
));
|
||||
} else {
|
||||
self.paint.set_path_effect(None);
|
||||
}
|
||||
|
||||
canvas.draw_line(
|
||||
(x, y - line_position + self.font_height),
|
||||
(x + width, y - line_position + self.font_height),
|
||||
&self.paint,
|
||||
);
|
||||
}
|
||||
|
||||
self.paint
|
||||
.set_color(style.foreground(&default_style.colors).to_color());
|
||||
let text = text.trim_end();
|
||||
if !text.is_empty() {
|
||||
for blob in self
|
||||
.shaper
|
||||
.shape_cached(text, style.bold, style.italic)
|
||||
.iter()
|
||||
{
|
||||
canvas.draw_text_blob(blob, (x, y), &self.paint);
|
||||
}
|
||||
}
|
||||
|
||||
if style.strikethrough {
|
||||
let line_position = region.center_y();
|
||||
self.paint
|
||||
.set_color(style.special(&default_style.colors).to_color());
|
||||
canvas.draw_line((x, line_position), (x + width, line_position), &self.paint);
|
||||
}
|
||||
|
||||
canvas.restore();
|
||||
}
|
||||
Loading…
Reference in New Issue