fix merge error

macos-click-through
Keith Simmons 3 years ago
parent c7694569bd
commit d62f008843

@ -48,7 +48,6 @@ impl Default for CursorSettings {
animate_in_insert_mode: true, animate_in_insert_mode: true,
animate_command_line: true, animate_command_line: true,
trail_size: 0.7, trail_size: 0.7,
distance_length_adjust: false,
vfx_mode: cursor_vfx::VfxMode::Disabled, vfx_mode: cursor_vfx::VfxMode::Disabled,
vfx_opacity: 200.0, vfx_opacity: 200.0,
vfx_particle_lifetime: 1.2, vfx_particle_lifetime: 1.2,
@ -229,7 +228,6 @@ impl CursorRenderer {
font_width: u64, font_width: u64,
font_height: u64, font_height: u64,
windows: &HashMap<u64, RenderedWindow>, windows: &HashMap<u64, RenderedWindow>,
current_mode: &EditorMode,
) { ) {
let (cursor_grid_x, cursor_grid_y) = self.cursor.grid_position; let (cursor_grid_x, cursor_grid_y) = self.cursor.grid_position;

@ -332,12 +332,8 @@ impl Renderer {
.collect(); .collect();
let windows = &self.rendered_windows; let windows = &self.rendered_windows;
self.cursor_renderer.update_cursor_destination( self.cursor_renderer
font_width, .update_cursor_destination(font_width, font_height, windows);
font_height,
windows,
&self.current_mode,
);
self.cursor_renderer.draw( self.cursor_renderer.draw(
&self.default_style.colors, &self.default_style.colors,

Loading…
Cancel
Save