Handle IME selection cursor hiding #198
Conversation
When the IME indicates a cursor of `None`, it means we should hide the cursor. This does that by collapsing the selection, hiding the caret, and clearing the text selection from the AccessKit node.
parley/src/layout/editor.rs
Outdated
| if self.compose.as_ref().map(|c| c.show_cursor).unwrap_or(true) { | ||
| if let Some(selection) = self | ||
| .selection | ||
| .to_access_selection(&self.layout, &self.layout_access) | ||
| { | ||
| node.set_text_selection(selection); | ||
| } | ||
| } else { | ||
| node.clear_text_selection(); |
There was a problem hiding this comment.
Is clearing the text selection, in response to the IME hiding the cursor, the right thing to do?
(I also wonder (unrelated to this PR), whether doing nothing when to_access_selection is None is right, though it appears that only happens when in a strange state.)
parley/src/layout/editor.rs
Outdated
| /// IME compose state. | ||
| #[derive(Clone)] | ||
| struct Compose { | ||
| /// Byte offsets of IME composing preedit text in the text buffer. | ||
| preedit_range: Range<usize>, | ||
| /// Whether the cursor should be shown. The IME can request to hide the cursor. | ||
| show_cursor: bool, | ||
| } |
There was a problem hiding this comment.
As a style note, I could be convinced to move both of these to PlainEditor... It's a trade-off between type-level correctness and ergonomics. In fact, "not-composing" could be encoded with an empty preedit_range, which with the current layout would shave 8 bytes off PlainEditor.
There was a problem hiding this comment.
self.compose.as_ref().map(|c| c.show_cursor).unwrap_or(true) is so ugly (even self.compose.as_ref().is_none_or(|c| c.show_cursor) is still pretty bad) that I think flattening this is a win. It's effectively only set in two functions anyway, so it's unlikely to get out-of-sync.
| self.selection.geometry(&self.layout) | ||
| } | ||
|
|
||
| /// Get a rectangle representing the current caret cursor position. | ||
| /// | ||
| /// There is not always a caret. For example, the IME may have indicated the caret should be | ||
| /// hidden. | ||
| pub fn cursor_geometry(&self, size: f32) -> Option<Rect> { |
There was a problem hiding this comment.
Handy that this was already an option...
parley/src/layout/editor.rs
Outdated
| /// IME compose state. | ||
| #[derive(Clone)] | ||
| struct Compose { | ||
| /// Byte offsets of IME composing preedit text in the text buffer. | ||
| preedit_range: Range<usize>, | ||
| /// Whether the cursor should be shown. The IME can request to hide the cursor. | ||
| show_cursor: bool, | ||
| } |
There was a problem hiding this comment.
self.compose.as_ref().map(|c| c.show_cursor).unwrap_or(true) is so ugly (even self.compose.as_ref().is_none_or(|c| c.show_cursor) is still pretty bad) that I think flattening this is a win. It's effectively only set in two functions anyway, so it's unlikely to get out-of-sync.
When the IME indicates a cursor of
None, it means we should hide the cursor. This does that by collapsing the selection, hiding the caret, and clearing the text selection from the AccessKit node.