language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 06:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

TextInput: Properly align the cursor and selection rect with different vertical alignment

Browse source
This commit is contained in:
Olivier Goffart 2021-08-11 16:01:03 +02:00
parent ba58bd86e5
commit 0b5e87b66b
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sixtyfps_runtime/rendering_backends/gl/lib.rs
View file

@ -713,6 +713,7 @@ impl ItemRenderer for GLItemRenderer {
.unwrap() .unwrap()
.as_font() .as_font()
.clone(); .clone();
let font_height = font.height();
let paint = match self.brush_to_paint( let paint = match self.brush_to_paint(
text_input.color(), text_input.color(),
@ -723,16 +724,23 @@ impl ItemRenderer for GLItemRenderer {
}; };
let letter_spacing = text_input.letter_spacing() * self.scale_factor; let letter_spacing = text_input.letter_spacing() * self.scale_factor;
let horizontal_alignment = text_input.horizontal_alignment();
let vertical_alignment = text_input.vertical_alignment();
let metrics = self.draw_text_impl( let metrics = self.draw_text_impl(
width, width,
height, height,
sixtyfps_corelib::items::TextInput::FIELD_OFFSETS.text.apply_pin(text_input), sixtyfps_corelib::items::TextInput::FIELD_OFFSETS.text.apply_pin(text_input),
&font, &font,
paint, paint,
text_input.horizontal_alignment(), horizontal_alignment,
text_input.vertical_alignment(), vertical_alignment,
letter_spacing, letter_spacing,
); );
let cursor_y = match vertical_alignment {
TextVerticalAlignment::top => 0.,
TextVerticalAlignment::center => (height - font_height) / 2.,
TextVerticalAlignment::bottom => (height - font_height),
};
// This way of drawing selected text isn't quite 100% correct. Due to femtovg only being able to // This way of drawing selected text isn't quite 100% correct. Due to femtovg only being able to
// have a simple rectangular selection - due to the use of the scissor clip - the selected text is // have a simple rectangular selection - due to the use of the scissor clip - the selected text is
@ -759,8 +767,8 @@ impl ItemRenderer for GLItemRenderer {
} }
let selection_rect = Rect::new( let selection_rect = Rect::new(
[selection_start_x, 0.].into(), [selection_start_x, cursor_y].into(),
[selection_end_x - selection_start_x, font.height()].into(), [selection_end_x - selection_start_x, font_height].into(),
); );
{ {
@ -787,8 +795,8 @@ impl ItemRenderer for GLItemRenderer {
sixtyfps_corelib::items::TextInput::FIELD_OFFSETS.text.apply_pin(text_input), sixtyfps_corelib::items::TextInput::FIELD_OFFSETS.text.apply_pin(text_input),
&font, &font,
femtovg::Paint::color(to_femtovg_color(&text_input.selection_foreground_color())), femtovg::Paint::color(to_femtovg_color(&text_input.selection_foreground_color())),
text_input.horizontal_alignment(), horizontal_alignment,
text_input.vertical_alignment(), vertical_alignment,
letter_spacing, letter_spacing,
); );
@ -811,9 +819,9 @@ impl ItemRenderer for GLItemRenderer {
let mut cursor_rect = femtovg::Path::new(); let mut cursor_rect = femtovg::Path::new();
cursor_rect.rect( cursor_rect.rect(
cursor_x, cursor_x,
0., cursor_y,
text_input.text_cursor_width() * self.scale_factor, text_input.text_cursor_width() * self.scale_factor,
font.height(), font_height,
); );
if let Some(text_paint) = self.brush_to_paint(text_input.color(), &mut cursor_rect) { if let Some(text_paint) = self.brush_to_paint(text_input.color(), &mut cursor_rect) {
self.shared_data.canvas.borrow_mut().fill_path(&mut cursor_rect, text_paint) self.shared_data.canvas.borrow_mut().fill_path(&mut cursor_rect, text_paint)