leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clip text box

Browse source
This commit is contained in:
Jeremy Soller 2025-11-06 16:49:17 -07:00
parent 966cc0f332
commit 392f6e6ab1
No known key found for this signature in database
GPG key ID: 670FDFB5428E05CA
1 changed files with 78 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

148
src/text_box.rs
View file

@ -643,80 +643,88 @@ where
// Draw editor UI // Draw editor UI
renderer.with_translation(Vector::new(view_position.x, view_position.y), |renderer| { renderer.with_translation(Vector::new(view_position.x, view_position.y), |renderer| {
renderer.with_transformation(Transformation::scale(1.0 / scale_factor), |renderer| { renderer.with_transformation(Transformation::scale(1.0 / scale_factor), |renderer| {
// Draw cached image (only has line numbers) renderer.with_layer(
if let Some(ref handle) = *handle_opt { Rectangle::new(
let image_size = image::Renderer::measure_image(renderer, handle); Point::new(0.0, 0.0),
image::Renderer::draw_image( Size::new(image_w as f32, image_h as f32),
renderer, ),
handle.clone(), |renderer| {
image::FilterMethod::Nearest, // Draw cached image (only has line numbers)
Rectangle::new( if let Some(ref handle) = *handle_opt {
Point::new(0.0, 0.0), let image_size = image::Renderer::measure_image(renderer, handle);
Size::new(image_size.width as f32, image_size.height as f32), image::Renderer::draw_image(
), renderer,
Radians(0.0), handle.clone(),
1.0, image::FilterMethod::Nearest,
[0.0; 4], Rectangle::new(
); Point::new(0.0, 0.0),
} Size::new(image_size.width as f32, image_size.height as f32),
),
// Calculate editor position Radians(0.0),
let scroll_x = editor.with_buffer(|buffer| buffer.scroll().horizontal); 1.0,
let pos = Point::new(editor_offset_x as f32, 0.0); [0.0; 4],
let size = Size::new((image_w - editor_offset_x) as f32, image_h as f32);
// Create custom renderer for rectangles
let mut custom_renderer = CustomRenderer { renderer, pos };
// Draw line highlight
if self.highlight_current_line {
let line_highlight = {
let convert_color = |color: syntect::highlighting::Color| {
cosmic_text::Color::rgba(color.r, color.g, color.b, color.a)
};
let syntax_theme = editor.theme();
//TODO: ideal fallback for line highlight color
syntax_theme
.settings
.line_highlight
.map_or(editor.background_color(), convert_color)
};
let cursor = editor.cursor();
editor.with_buffer(|buffer| {
for run in buffer.layout_runs() {
if run.line_i != cursor.line {
continue;
}
custom_renderer.rectangle(
0,
run.line_top as i32,
(image_w - editor_offset_x) as u32,
metrics.line_height as u32,
line_highlight,
); );
} }
});
}
// Draw editor selection, cursor, etc. // Calculate editor position
editor.render(&mut custom_renderer); let scroll_x = editor.with_buffer(|buffer| buffer.scroll().horizontal);
let pos = Point::new(editor_offset_x as f32, 0.0);
let size = Size::new((image_w - editor_offset_x) as f32, image_h as f32);
// Draw editor text // Create custom renderer for rectangles
match editor.buffer_ref() { let mut custom_renderer = CustomRenderer { renderer, pos };
cosmic_text::BufferRef::Arc(buffer) => {
renderer.fill_raw(Raw { // Draw line highlight
buffer: Arc::downgrade(&buffer), if self.highlight_current_line {
position: pos - Vector::new(scroll_x, 0.0), let line_highlight = {
color: Color::new(1.0, 1.0, 1.0, 1.0), let convert_color = |color: syntect::highlighting::Color| {
clip_bounds: Rectangle::new(pos, size), cosmic_text::Color::rgba(color.r, color.g, color.b, color.a)
}); };
} let syntax_theme = editor.theme();
_ => { //TODO: ideal fallback for line highlight color
log::error!("cosmic-text buffer not an Arc"); syntax_theme
} .settings
} .line_highlight
.map_or(editor.background_color(), convert_color)
};
let cursor = editor.cursor();
editor.with_buffer(|buffer| {
for run in buffer.layout_runs() {
if run.line_i != cursor.line {
continue;
}
custom_renderer.rectangle(
0,
run.line_top as i32,
(image_w - editor_offset_x) as u32,
metrics.line_height as u32,
line_highlight,
);
}
});
}
// Draw editor selection, cursor, etc.
editor.render(&mut custom_renderer);
// Draw editor text
match editor.buffer_ref() {
cosmic_text::BufferRef::Arc(buffer) => {
renderer.fill_raw(Raw {
buffer: Arc::downgrade(&buffer),
position: pos - Vector::new(scroll_x, 0.0),
color: Color::new(1.0, 1.0, 1.0, 1.0),
clip_bounds: Rectangle::new(pos, size),
});
}
_ => {
log::error!("cosmic-text buffer not an Arc");
}
}
},
)
}) })
}); });