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

Implement state-less scrolling in TextInput

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-11-05 03:33:24 +01:00
parent 470266f540
commit a2161586da
1 changed files with 59 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,70 +87,79 @@ impl text_input::Renderer for Renderer {
vertical_alignment: VerticalAlignment::Center, vertical_alignment: VerticalAlignment::Center,
}; };
let content = Primitive::Clip { let (contents_primitive, offset) = if text_input.state.is_focused {
bounds: text_bounds, use wgpu_glyph::{GlyphCruncher, Scale, Section};
offset: Vector::new(0, 0),
content: Box::new(if text_input.state.is_focused {
use wgpu_glyph::{GlyphCruncher, Scale, Section};
let text_before_cursor = &text_input let text_before_cursor = &text_input
.value .value
.until(text_input.state.cursor_position(&text_input.value)) .until(text_input.state.cursor_position(&text_input.value))
.to_string(); .to_string();
let mut text_value_width = self let mut text_value_width = self
.glyph_brush .glyph_brush
.borrow_mut() .borrow_mut()
.glyph_bounds(Section { .glyph_bounds(Section {
text: text_before_cursor, text: text_before_cursor,
bounds: (f32::INFINITY, text_bounds.height), bounds: (f32::INFINITY, text_bounds.height),
scale: Scale { x: size, y: size }, scale: Scale { x: size, y: size },
..Default::default() ..Default::default()
}) })
.map(|bounds| bounds.width().round()) .map(|bounds| bounds.width().round())
.unwrap_or(0.0); .unwrap_or(0.0);
let spaces_at_the_end = text_before_cursor.len() let spaces_at_the_end =
- text_before_cursor.trim_end().len(); text_before_cursor.len() - text_before_cursor.trim_end().len();
if spaces_at_the_end > 0 { if spaces_at_the_end > 0 {
let space_width = { let space_width = {
let glyph_brush = self.glyph_brush.borrow(); let glyph_brush = self.glyph_brush.borrow();
// TODO: Select appropriate font // TODO: Select appropriate font
let font = &glyph_brush.fonts()[0]; let font = &glyph_brush.fonts()[0];
font.glyph(' ') font.glyph(' ')
.scaled(Scale { x: size, y: size }) .scaled(Scale { x: size, y: size })
.h_metrics() .h_metrics()
.advance_width .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,
}; };
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 { Primitive::Group {
primitives: vec![value, cursor], primitives: vec![value, cursor],
} },
} else { Vector::new(
value ((text_value_width + 5.0) - text_bounds.width).max(0.0)
}), as u32,
0,
),
)
} else {
(value, Vector::new(0, 0))
};
let contents = Primitive::Clip {
bounds: text_bounds,
offset,
content: Box::new(contents_primitive),
}; };
( (
Primitive::Group { Primitive::Group {
primitives: vec![border, input, content], primitives: vec![border, input, contents],
}, },
if is_mouse_over { if is_mouse_over {
MouseCursor::Text MouseCursor::Text