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

Render TextInput cursor inside the clipping area

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-10-31 04:43:29 +01:00
parent 51a0e99097
commit d3cdee1d9b
2 changed files with 88 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/src/widget/text_input.rs
View file

@ -121,6 +121,7 @@ impl State {
} }
} }
// TODO: Use `unicode-segmentation`
pub struct Value(Vec<char>); pub struct Value(Vec<char>);
impl Value { impl Value {

33
wgpu/src/renderer/text_input.rs
View file

@ -57,10 +57,7 @@ impl text_input::Renderer for Renderer {
let size = f32::from(text_input.size.unwrap_or(self.default_size())); let size = f32::from(text_input.size.unwrap_or(self.default_size()));
let text = text_input.value.to_string(); let text = text_input.value.to_string();
let value = Primitive::Clip { let value = Primitive::Text {
bounds: text_bounds,
offset: 0,
content: Box::new(Primitive::Text {
content: if text.is_empty() { content: if text.is_empty() {
text_input.placeholder.clone() text_input.placeholder.clone()
} else { } else {
@ -88,19 +85,17 @@ impl text_input::Renderer for Renderer {
size, size,
horizontal_alignment: HorizontalAlignment::Left, horizontal_alignment: HorizontalAlignment::Left,
vertical_alignment: VerticalAlignment::Center, vertical_alignment: VerticalAlignment::Center,
}),
}; };
( let content = Primitive::Clip {
Primitive::Group { bounds: text_bounds,
primitives: if text_input.state.is_focused { offset: 0,
content: Box::new(if text_input.state.is_focused {
use wgpu_glyph::{GlyphCruncher, Scale, Section}; use wgpu_glyph::{GlyphCruncher, Scale, Section};
let text_before_cursor = &text_input let text_before_cursor = &text_input
.value .value
.until( .until(text_input.state.cursor_position(&text_input.value))
text_input.state.cursor_position(&text_input.value),
)
.to_string(); .to_string();
let mut text_value_width = self let mut text_value_width = self
@ -131,8 +126,7 @@ impl text_input::Renderer for Renderer {
.advance_width .advance_width
}; };
text_value_width += text_value_width += spaces_at_the_end as f32 * space_width;
spaces_at_the_end as f32 * space_width;
} }
let cursor = Primitive::Quad { let cursor = Primitive::Quad {
@ -146,10 +140,17 @@ impl text_input::Renderer for Renderer {
border_radius: 0, border_radius: 0,
}; };
vec![border, input, value, cursor] Primitive::Group {
primitives: vec![value, cursor],
}
} else { } else {
vec![border, input, value] value
}, }),
};
(
Primitive::Group {
primitives: vec![border, input, content],
}, },
if is_mouse_over { if is_mouse_over {
MouseCursor::Text MouseCursor::Text