Skip to content

Add struct kas::text::ConfiguredDisplay; replace trait Editor with struct #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhardy merged 21 commits into from
Mar 17, 2026
Merged

Add struct kas::text::ConfiguredDisplay; replace trait Editor with struct #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3cd070d
Add struct kas::text::ConfiguredDisplay
dhardy Mar 10, 2026
95c1458
impl Layout for ConfiguredDisplay
dhardy Mar 10, 2026
27bf475
Use ConfiguredDisplay in fn SelectionHelper::expand
dhardy Mar 15, 2026
f3d7842
Add fn Text::draw_with_color; remove basic DrawCx text fns
dhardy Mar 15, 2026
a1eb156
Move kas::theme::Text to kas::text::Text
dhardy Mar 15, 2026
3b85506
Let fn ConfiguredDisplay::text_is_rtl use the raw text if not prepared
dhardy Mar 15, 2026
408bc80
Remove Deref, DerefMut impls for editor::Component
dhardy Mar 15, 2026
ebf9ac5
Prepare text::ConfiguredDisplay for external usage
dhardy Mar 15, 2026
5668fe0
Use text::ConfiguredDisplay in EditorComponent
dhardy Mar 15, 2026
dc47868
Remove text from text::highlight::Text
dhardy Mar 15, 2026
23bf901
Editor: update highlighting in prepare_runs
dhardy Mar 16, 2026
41d8b65
Make edit::highlight::Text pub(crate)
dhardy Mar 16, 2026
6d83326
Remove trait EditableText
dhardy Mar 16, 2026
8540d73
Revise editor error state; clear when calling edit guard
dhardy Mar 16, 2026
ae2ee27
Revise fn editor::Component::prepare
dhardy Mar 16, 2026
9cd31ae
Replace Edit{Field, Box} impls of DerefMut with fn edit
dhardy Mar 16, 2026
6aff38a
Move highlighter out of EditorComponent
dhardy Mar 16, 2026
ff7166f
Remove trait Editor (move fns to struct EditorComponent -> Editor)
dhardy Mar 16, 2026
b0e6c25
Doc fixes
dhardy Mar 15, 2026
4ec5061
Remove test _draw_ext (is useless)
dhardy Mar 16, 2026
a8195f9
Fix examples
dhardy Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/kas-core/src/draw/draw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ impl<'a, DS: DrawSharedImpl> DrawIface<'a, DS> {
/// Text is drawn from `pos` and clipped to `bounding_box`.
///
/// The `text` display must be prepared prior to calling this method.
/// Typically this is done using a [`crate::theme::Text`] object.
/// Typically this is done using a [`crate::text::Text`] object.
pub fn text_with_color(
&mut self,
pos: Vec2,
Expand Down Expand Up @@ -263,7 +263,7 @@ pub trait Draw {
/// Text is drawn from `pos` and clipped to `bounding_box`.
///
/// The `text` display must be prepared prior to calling this method.
/// Typically this is done using a [`crate::theme::Text`] object.
/// Typically this is done using a [`crate::text::Text`] object.
fn text(
&mut self,
pos: Vec2,
Expand All @@ -280,7 +280,7 @@ pub trait Draw {
/// Draw text decorations (e.g. underlines)
///
/// The `text` display must be prepared prior to calling this method.
/// Typically this is done using a [`crate::theme::Text`] object.
/// Typically this is done using a [`crate::text::Text`] object.
fn decorate_text(
&mut self,
pos: Vec2,
Expand Down
4 changes: 2 additions & 2 deletions crates/kas-core/src/draw/draw_shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pub trait DrawSharedImpl: Any {
/// Text is drawn from `pos` and clipped to `bounding_box`.
///
/// The `text` display must be prepared prior to calling this method.
/// Typically this is done using a [`crate::theme::Text`] object.
/// Typically this is done using a [`crate::text::Text`] object.
fn draw_text(
&mut self,
draw: &mut Self::Draw,
Expand All @@ -208,7 +208,7 @@ pub trait DrawSharedImpl: Any {
/// Draw text decorations (e.g. underlines)
///
/// The `text` display must be prepared prior to calling this method.
/// Typically this is done using a [`crate::theme::Text`] object.
/// Typically this is done using a [`crate::text::Text`] object.
fn decorate_text(
&mut self,
draw: &mut Self::Draw,
Expand Down
Loading