dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Fix input mark text render. (#1298)

Browse source 
Fix #1293 change broken the input mask render (password mask,
placeholder ...)
This commit is contained in:
Jason Lee 2025-09-29 10:40:39 +08:00 committed by GitHub
parent 172015f147
commit 3ee8d7ffd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/ui/src/input/element.rs
View file

@ -527,14 +527,27 @@ impl TextElement {
}
fn layout_lines(
text: &Rope,
state: &InputState,
display_text: &Rope,
text_wrapper: &TextWrapper,
visible_range: &Range<usize>,
font_size: Pixels,
runs: &[TextRun],
window: &mut Window,
) -> Vec<LineLayout> {
let visible_text = text
let is_multi_line = state.mode.is_multi_line();
if !is_multi_line {
let shaped_line = window.text_system().shape_line(
display_text.to_string().into(),
font_size,
&runs,
None,
);
return vec![LineLayout::new().lines(smallvec::smallvec![shaped_line])];
}
let visible_text = display_text
.slice_lines(visible_range.start..visible_range.end)
.to_string();
@ -545,6 +558,7 @@ impl TextElement {
.lines
.get(visible_range.start + ix)
.expect("line should exists in text_wrapper");
// if line_item.len() != line.len() {
// dbg!(&line, &line_item.wrapped_lines);
// }
@ -853,7 +867,8 @@ impl Element for TextElement {
};
let lines = Self::layout_lines(
&text,
&state,
&display_text,
&state.text_wrapper,
&visible_range,
font_size,

5
crates/ui/src/input/text_wrapper.rs
View file

@ -255,6 +255,11 @@ impl LineLayout {
}
}
pub(crate) fn lines(mut self, wrapped_lines: SmallVec<[ShapedLine; 1]>) -> Self {
self.set_wrapped_lines(wrapped_lines);
self
}
pub(crate) fn set_wrapped_lines(&mut self, wrapped_lines: SmallVec<[ShapedLine; 1]>) {
self.len = wrapped_lines.iter().map(|l| l.len).sum();
let width = wrapped_lines