me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2407 from iced-rs/fix/text-editor-quirks

Browse source 
Fix some `text_editor` quirks
This commit is contained in:
Héctor Ramón 2024-04-26 15:38:46 +02:00 • committed by GitHub
commit ce12231e22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/src/text/editor.rs
View file

@ -456,10 +456,14 @@ impl editor::Editor for Editor {
} }
} }
Action::Scroll { lines } => { Action::Scroll { lines } => {
editor.action( let (_, height) = editor.buffer().size();
font_system.raw(),
cosmic_text::Action::Scroll { lines }, if height < i32::MAX as f32 {
); editor.action(
font_system.raw(),
cosmic_text::Action::Scroll { lines },
);
}
} }
} }

30
widget/src/text_editor.rs
View file

@ -569,23 +569,27 @@ where
if state.is_focused { if state.is_focused {
match internal.editor.cursor() { match internal.editor.cursor() {
Cursor::Caret(position) => { Cursor::Caret(position) => {
let position = position + translation; let cursor =
Rectangle::new(
position + translation,
Size::new(
1.0,
self.line_height
.to_absolute(self.text_size.unwrap_or_else(
|| renderer.default_size(),
))
.into(),
),
);
if bounds.contains(position) { if let Some(clipped_cursor) = bounds.intersection(&cursor) {
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds: Rectangle { bounds: Rectangle {
x: position.x.floor(), x: clipped_cursor.x.floor(),
y: position.y, y: clipped_cursor.y,
width: 1.0, width: clipped_cursor.width,
height: self height: clipped_cursor.height,
.line_height
.to_absolute(
self.text_size.unwrap_or_else(
|| renderer.default_size(),
),
)
.into(),
}, },
..renderer::Quad::default() ..renderer::Quad::default()
}, },