De-traitify text module #515
Conversation
| @@ -675,27 +616,43 @@ impl<Str: Deref<Target = str> + TextStorage> Selectable for Str { | |||
| } | |||
| } | |||
|
|
|||
| /// A cursor type that implements `EditableTextCursor` for string types | |||
| /// A cursor type with helper methods for working with strings. | |||
| #[derive(Debug)] | |||
| pub struct StringCursor<'a> { | |||
There was a problem hiding this comment.
Why is this still pub? It has no public API except for construction.
PoignardAzur
force-pushed
the
refactor_text
branch
from
722c639
to
d35bd2e
Compare
PoignardAzur
force-pushed
the
refactor_text
branch
from
d35bd2e
to
9220226
Compare
Co-authored-by: Daniel McNab <[email protected]>
|
Since I keep delaying the text refactor, and this is mostly ready, I'm removing the draft status and the TMP commit. I'll do the text refactor in another branch. |
| pub fn offset_for_delete_backwards(caret_position: usize, text: &impl AsRef<str>) -> usize { | ||
| backspace_offset(text.as_ref(), caret_position) | ||
| } |
There was a problem hiding this comment.
I'd probably just delete this function (to be clear, this same comment applies to the old version as well...)
| // We might change this to a rope based structure at some point. | ||
| // If you need a text box which uses a different text type, you should | ||
| // create a custom widget |
There was a problem hiding this comment.
The gist of this comment should be moved into TextEditor.
| impl<T: EditableText> Deref for TextEditor<T> { | ||
| type Target = TextWithSelection<T>; | ||
| impl Deref for TextEditor { | ||
| type Target = TextWithSelection<String>; |
There was a problem hiding this comment.
I suspect we might want to remove this Deref at some point - it's a bit messy. Not a job for this PR
masonry/src/text/layout.rs
Outdated
| // Currently, this is used for underlining IME suggestions | ||
| // applying a brush to selected text. |
There was a problem hiding this comment.
| // Currently, this is used for underlining IME suggestions | |
| // applying a brush to selected text. | |
| // Currently, this is used for: | |
| // - underlining IME suggestions | |
| // - applying a brush to selected text. |
or
| // Currently, this is used for underlining IME suggestions | |
| // applying a brush to selected text. | |
| // Currently, this is used for underlining IME suggestions | |
| // and applying a brush to selected text. |
| fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
| f.debug_struct("TextLayout") | ||
| .field("text", &self.text.as_str().len()) | ||
| .field("text", &self.text.as_ref()) |
There was a problem hiding this comment.
Maybe we want this to be truncated?
masonry/src/text/selection.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl<Str: Deref<Target = str> + AsRef<str> + Eq> Selectable for Str { |
There was a problem hiding this comment.
I'm a bit confused why this needs both Deref and AsRef
masonry/src/widget/textbox.rs
Outdated
| #[cfg(FALSE)] | ||
| if !self.editor.text().links().is_empty() { | ||
| tracing::warn!("Links present in text, but not yet integrated"); | ||
| } |
There was a problem hiding this comment.
Probably should just have the same comment as Prose?
There was a problem hiding this comment.
I'm removing references to links for now. They were copy-pasted from Label's implementation, but I don't see links in editable text being implemented any time soon.
masonry/src/text/selection.rs
Outdated
| @@ -686,27 +627,43 @@ impl<Str: Deref<Target = str> + TextStorage> Selectable for Str { | |||
| } | |||
| } | |||
|
|
|||
| /// A cursor type that implements `EditableTextCursor` for string types | |||
| /// A cursor type with helper methods for working with strings. | |||
There was a problem hiding this comment.
| /// A cursor type with helper methods for working with strings. | |
| /// A cursor type with helper methods for moving through strings. |
This helps make it clear to readers that the methods are mutating a cursor position
No description provided.