Text/multiline #134

hwchen · 2020-02-10T17:21:37Z

Replaces #103 (which used dwrite and direct2d crates instead of raw_d2d).

Line breaking algorithm is naive. Iterates down text, checking width of each possible break.

implement new methods for multiline in `TextLayout'
- update_width
- line_text
- line_metric
- line_count
- and fix d2d width to include trailing whitespace
update hit testing
- account for multiline
- if out of bounds top or bottom in y axis, will hit test closest line to boundary
- all hit testing includes trailing whitespace
lots of tests
- basic multiline and hit testing for d2d and cairo and web
- new test harness (using wasm-pack) for web

…fix errors for CI)

cmyr

A couple notes and questions about the API here. :)

piet/src/text.rs

cmyr · 2020-03-03T19:11:00Z

piet/src/text.rs

+    /// Does not include trailing whitespace.
+    pub line_end_offset: usize,
+
+    /// Line width.


What are the units? I would expect this to be in pixels or something but it's not clear.

I'm also unsure about this name, 'cumulative' implies that this includes the widths of preceding lines or something? If that's the case we should document it, but otherwise this can just be width?

Hmmm... this was in the last PR for line breaking, so I carried it over. But looking at it again I'm not sure exactly why we need cumulative width. Is it better to just use width?

I think we want just "width", in pixels. Also I think this comment was maybe in response to this?

Raph: I think it makes sense not to do cumulative width of lines, but it does make sense to do cumulative code unit counts. This is not a tricky thing, a "cumulative code unit count" is just an offset.

#134 (comment)

cmyr · 2020-03-03T19:11:23Z

piet/src/text.rs

+    /// Does not include trailing whitespace.
+    pub cumulative_width: f64,
+
+    /// Length (in code units) of trailing whitespace.


if this is code units it should be an integer type?

I made some mixup here; I think trailing whitespace should be in code units (usize)

cmyr · 2020-03-04T15:39:18Z

piet/src/text.rs

+    fn line_text(&self, line_number: usize) -> Option<&str>;
+
+    /// Given a line number, return a reference to that line's metrics.
+    fn line_metric(&self, line_number: usize) -> Option<&LineMetric>;


if LineMetric doesn't contain anything expensive, this should return it by value, not by reference.

raphlinus

I did a medium-depth pass. I found a few minor things, but overall I think we can merge this and then start trying to do the druid integration side; no doubt that will uncover whatever additional things might need to be fixed.

piet-cairo/src/text.rs

piet/src/text.rs

piet-cairo/src/text.rs

hwchen · 2020-04-02T21:26:18Z

Thanks for the quick turnaround. I'll get this ported to piet-web asap.

Keep updated with new changes to master

…ework

- hit testing tests - fix bug in hit testing `trailing` bool - in `width`, use width with trailing whitespace - note that when y is past boundary for hit testing point, x still affects the text position

…ultiline

cmyr

I am of the opinion that we get this in and then see what issues shake out. 😄

hwchen · 2020-04-09T18:44:49Z

Woohoo! I'm ready for the bug reports :)

hwchen added 16 commits February 6, 2020 14:06

[cairo] refactor text to own module

4ed2b0c

[web] refactor text to own module

6513bc1

[svg] text own module, [all] fmt, some clippy

7e3db02

[all] clippy

c80b22c

[all] clippy

8f2f902

[d2d] refactor text in own module

1c3e04d

[d2d, piet] clippy warnings

29a0c39

cargo fmt

9a94ef3

[text] add docstring to module

9587eb1

[d2d] fix pub use issue

cf60637

[text] update TextLayout trait for linebreaking, (nullrender)

164b5b0

[text] line break methods use &self

4bf2cac

[text] remove comments

857d63d

[text] update method signatures

949097f

[text] update line methods to return Option

4c0d3a8

[text] add width to constructor

f054731

hwchen mentioned this pull request Feb 10, 2020

[text] update TextLayout trait for linebreaking, (nullrender) #103

Closed

4 tasks

hwchen added 11 commits February 14, 2020 11:32

Merge branch 'master' into text/multiline

119f528

[wip, piet] update LineMetrics, Clone for TextLayout, fix pic examples

ef691cf

[piet] update LineMetrics fields

98b8231

[all] TextLayout: Clone bound

51369b5

[d2d] stub multiline text methods, text layout update

79ccacb

[svg, web, cairo] stub multiline trait methods, fix new_text_layout (…

bfae757

…fix errors for CI)

[cairo] pass tests with new new_text_layout

2d2b172

[all] cargo fmt

6eae9d3

[cairo] forgot grapheme test

49d30e8

[cairo] fmt grapheme test

05e539e

[d2d] fix tests for new new_text_layout

427e2fd

cmyr reviewed Mar 3, 2020

View reviewed changes

cmyr reviewed Mar 4, 2020

View reviewed changes

[cairo] comments and debug cleanup

d9d38d3

raphlinus reviewed Apr 2, 2020

View reviewed changes

piet-cairo/src/text.rs Outdated Show resolved Hide resolved

piet/src/text.rs Show resolved Hide resolved

piet/src/text.rs Outdated Show resolved Hide resolved

piet-cairo/src/text.rs Outdated Show resolved Hide resolved

hwchen added 2 commits April 3, 2020 10:50

[cairo] get width as iterator

d4d070a

[cairo] clean comments, dbg

1e266a6

hwchen force-pushed the text/multiline branch from 40e6541 to 1e266a6 Compare April 3, 2020 15:01

hwchen added 16 commits April 3, 2020 11:42

[text] update TextLayout docs

e02b477

Merge remote-tracking branch 'upstream/master' into text/multiline

673fa58

Keep updated with new changes to master

[web] linemetric module, and build textlayout with

6eeb718

[web] impl line metric and width trait methods

afcdea2

[web] hit testing with multilines

62f0bea

[web] fix some comments

02e2e1e

[web] move tests to text module from example, use wasm-pack test fram…

75f3928

…ework

[web] multiline hit test tests

0a5dc1e

[web] readme notes on running tests

5ae3d0f

[d2d] bugs, hit testing

17e6216

- hit testing tests - fix bug in hit testing `trailing` bool - in `width`, use width with trailing whitespace - note that when y is past boundary for hit testing point, x still affects the text position

[cairo] hit testing does not hide trailing whitespace

9f659aa

[web] hit testing does not hide trailing whitespace

7a61d74

[cairo] hit testing for x even if y out of bounds

02d6060

[web] hit testing for x even if y out of bounds

5c0fdaf

[text] when y above bounding box, x still hit tested on first line

9be84b9

[cairo] test hard break in lines

ffb9034

hwchen force-pushed the text/multiline branch from f03e034 to ffb9034 Compare April 9, 2020 02:06

hwchen marked this pull request as ready for review April 9, 2020 02:07

hwchen added 2 commits April 8, 2020 22:16

Merge branch 'master' of ssh://github.com/linebender/piet into text/m…

0c3d056

…ultiline

[web, cairo] fix web test warnings, make lines ard break test linux only

81f37f9

cmyr approved these changes Apr 9, 2020

View reviewed changes

hwchen merged commit dff29a3 into linebender:master Apr 9, 2020

hwchen deleted the text/multiline branch April 10, 2020 16:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Text/multiline #134

Text/multiline #134

hwchen commented Feb 10, 2020 •

edited

Loading

cmyr left a comment

cmyr Mar 3, 2020

hwchen Mar 6, 2020

cmyr Mar 6, 2020

cmyr Mar 3, 2020

hwchen Mar 6, 2020

cmyr Mar 4, 2020

raphlinus left a comment

hwchen commented Apr 2, 2020

cmyr left a comment

hwchen commented Apr 9, 2020

Text/multiline #134

Text/multiline #134

Conversation

hwchen commented Feb 10, 2020 • edited Loading

cmyr left a comment

Choose a reason for hiding this comment

cmyr Mar 3, 2020

Choose a reason for hiding this comment

hwchen Mar 6, 2020

Choose a reason for hiding this comment

cmyr Mar 6, 2020

Choose a reason for hiding this comment

cmyr Mar 3, 2020

Choose a reason for hiding this comment

hwchen Mar 6, 2020

Choose a reason for hiding this comment

cmyr Mar 4, 2020

Choose a reason for hiding this comment

raphlinus left a comment

Choose a reason for hiding this comment

hwchen commented Apr 2, 2020

cmyr left a comment

Choose a reason for hiding this comment

hwchen commented Apr 9, 2020

hwchen commented Feb 10, 2020 •

edited

Loading