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 {

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

@ -57,99 +57,100 @@ 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 {
content: if text.is_empty() {
text_input.placeholder.clone()
} else {
text.clone()
},
color: if text.is_empty() {
Color {
r: 0.7,
g: 0.7,
b: 0.7,
a: 1.0,
}
} else {
Color {
r: 0.3,
g: 0.3,
b: 0.3,
a: 1.0,
}
},
bounds: Rectangle {
width: f32::INFINITY,
..text_bounds
},
size,
horizontal_alignment: HorizontalAlignment::Left,
vertical_alignment: VerticalAlignment::Center,
};
let content = Primitive::Clip {
bounds: text_bounds, bounds: text_bounds,
offset: 0, offset: 0,
content: Box::new(Primitive::Text { content: Box::new(if text_input.state.is_focused {
content: if text.is_empty() { use wgpu_glyph::{GlyphCruncher, Scale, Section};
text_input.placeholder.clone()
} else { let text_before_cursor = &text_input
text.clone() .value
}, .until(text_input.state.cursor_position(&text_input.value))
color: if text.is_empty() { .to_string();
Color {
r: 0.7, let mut text_value_width = self
g: 0.7, .glyph_brush
b: 0.7, .borrow_mut()
a: 1.0, .glyph_bounds(Section {
} text: text_before_cursor,
} else { bounds: (f32::INFINITY, text_bounds.height),
Color { scale: Scale { x: size, y: size },
r: 0.3, ..Default::default()
g: 0.3, })
b: 0.3, .map(|bounds| bounds.width().round())
a: 1.0, .unwrap_or(0.0);
}
}, let spaces_at_the_end = text_before_cursor.len()
bounds: Rectangle { - text_before_cursor.trim_end().len();
width: f32::INFINITY,
..text_bounds if spaces_at_the_end > 0 {
}, let space_width = {
size, let glyph_brush = self.glyph_brush.borrow();
horizontal_alignment: HorizontalAlignment::Left,
vertical_alignment: VerticalAlignment::Center, // TODO: Select appropriate font
let font = &glyph_brush.fonts()[0];
font.glyph(' ')
.scaled(Scale { x: size, y: size })
.h_metrics()
.advance_width
};
text_value_width += spaces_at_the_end as f32 * space_width;
}
let cursor = Primitive::Quad {
bounds: Rectangle {
x: text_bounds.x + text_value_width,
y: text_bounds.y,
width: 1.0,
height: text_bounds.height,
},
background: Background::Color(Color::BLACK),
border_radius: 0,
};
Primitive::Group {
primitives: vec![value, cursor],
}
} else {
value
}), }),
}; };
( (
Primitive::Group { Primitive::Group {
primitives: if text_input.state.is_focused { primitives: vec![border, input, content],
use wgpu_glyph::{GlyphCruncher, Scale, Section};
let text_before_cursor = &text_input
.value
.until(
text_input.state.cursor_position(&text_input.value),
)
.to_string();
let mut text_value_width = self
.glyph_brush
.borrow_mut()
.glyph_bounds(Section {
text: text_before_cursor,
bounds: (f32::INFINITY, text_bounds.height),
scale: Scale { x: size, y: size },
..Default::default()
})
.map(|bounds| bounds.width().round())
.unwrap_or(0.0);
let spaces_at_the_end = text_before_cursor.len()
- text_before_cursor.trim_end().len();
if spaces_at_the_end > 0 {
let space_width = {
let glyph_brush = self.glyph_brush.borrow();
// TODO: Select appropriate font
let font = &glyph_brush.fonts()[0];
font.glyph(' ')
.scaled(Scale { x: size, y: size })
.h_metrics()
.advance_width
};
text_value_width +=
spaces_at_the_end as f32 * space_width;
}
let cursor = Primitive::Quad {
bounds: Rectangle {
x: text_bounds.x + text_value_width,
y: text_bounds.y,
width: 1.0,
height: text_bounds.height,
},
background: Background::Color(Color::BLACK),
border_radius: 0,
};
vec![border, input, value, cursor]
} else {
vec![border, input, value]
},
}, },
if is_mouse_over { if is_mouse_over {
MouseCursor::Text MouseCursor::Text