Merge pull request #1098 from cmot17/master

Fix issue with text selection in text_input widget
This commit is contained in:
Héctor Ramón 2021-10-25 16:59:10 +07:00 committed by GitHub
commit 8a2a7f7e21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -335,29 +335,27 @@ where
let text_layout = layout.children().next().unwrap(); let text_layout = layout.children().next().unwrap();
let target = position.x - text_layout.bounds().x; let target = position.x - text_layout.bounds().x;
if target > 0.0 { let value = if self.is_secure {
let value = if self.is_secure { self.value.secure()
self.value.secure() } else {
} else { self.value.clone()
self.value.clone() };
};
let position = renderer let position = renderer
.find_cursor_position( .find_cursor_position(
text_layout.bounds(), text_layout.bounds(),
self.font, self.font,
self.size, self.size,
&value, &value,
&self.state, &self.state,
target, target,
) )
.unwrap_or(0); .unwrap_or(0);
self.state.cursor.select_range( self.state.cursor.select_range(
self.state.cursor.start(&value), self.state.cursor.start(&value),
position, position,
); );
}
return event::Status::Captured; return event::Status::Captured;
} }