On Mon, 4 May 2026 23:03:34 GMT, Andy Goryachev <[email protected]> wrote:
>> ### Summary >> >> This PR adds support for controlling tab stops: the `TAB_STOPS` paragraph >> attribute and the `defaultTabStops` property in the `RichTextModel`. >> >> While adding the paragraph attribute is a trivial process, adding a >> model-wide property requires adding of a mechanism to support document >> properties (something that was originally omitted in the first incubating >> release). Using the document properties, we can now persist not only the >> default tab stops, but also provide the version umber for the storage format >> provided by the `RichTextFormatHandler`, which will enable support the >> format evolution in the future [0]. >> >> To showcase the feature, the `RichEditorDemoApp` gains a visual ruler and >> additional dialogs and menus. >> >> <img width="822" height="381" alt="Screenshot 2026-03-04 at 14 00 30" >> src="https://github.com/user-attachments/assets/32251846-f11a-4e87-b74a-44c21d629550"; >> /> >> >> >> ### Paragraph Attribute >> >> Paragraph-specific tab stops are enabled by: >> >> - `StyleAttributeMap.TAB_STOPS` constant >> - `StyleAttributeMap.Builder.setTabStops(double ... positions)` >> >> ### Default Tab Stops >> >> After the last paragraph tab stop, or when no paragraph tab stops is set, >> the document provides a way to set default tab stops via the model's >> `defaultTabStops` property: >> >> These changes support the new property and other document properties: >> >> - document-wide properties support in the `StyledTextModel` base class >> - `defaultTabStops` property in the `RichTextModel` and >> `RichTextFormatHandler` >> - document properties `VERSION` and `DEFAULT_TAB_STOPS` >> - `StyledSegment`: `ofDocumentProperties()` factory, >> `getDocumentProperties()` >> >> ### Other Improvements >> >> A number of other improvements were made along with the tab stop related >> changes: >> >> - `character()`, `paragraph()`, and `document()` factory methods in the >> `StyleAttribute` class >> - `isCharacterAttribute()`, `isParagraphAttribute()`, and >> `isDocumentAttribute()` methods in the `StyleAttribute` class >> - `RichTextArea`: `documentArea` read-only property >> >> >> ### Questions to the Reviewers >> >> - should the informational note [0] be added to the repo, and where? maybe >> under `doc-files/controls/RichTextArea` ? >> >> ### References >> >> [0] [Rich Text Area (Incubator) Data Format Version >> 2](https://github.com/andy-goryachev-oracle/jfx/blob/8356042.ruler/doc-files/controls/RichTextArea/RichTextArea_DataFormat_v2-incubator.md) >> >> --------- >> - [x] I confirm that I make thi... > > Andy Goryachev has updated the pull request with a new target base due to a > merge or a rebase. The pull request now contains 180 commits: > > - Merge branch 'master' into 8356042.ruler > - incubator > - Merge remote-tracking branch 'origin/master' into 8356042.ruler > - \@ > - format version > - review comments > - Merge branch 'master' into 8356042.ruler > - review comments > - Merge branch 'master' into 8356042.ruler > - add exports > - ... and 170 more: https://git.openjdk.org/jfx/compare/277aec13...f8fa16d0 Added a couple more comments / questions. I'll look at the CSR soon. modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/RichTextFormatHandler.java line 62: > 60: * PARAGRAPH[] > 61: * > 62: * VERSION_STRING*: { I presume this is optional to support backward compatibility with saved files prior to adding the version? When the RichTextArea API is finalized, this should be a required element. modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/StyledSegment.java line 262: > 260: * @since 27 > 261: */ > 262: public static StyledSegment ofVersion(String version) { What is the advantage of making the version number be a `StyledSegment` (as opposed to a separate type, e.g., `Header` or `Version`)? ------------- PR Review: https://git.openjdk.org/jfx/pull/1800#pullrequestreview-4323421474 PR Review Comment: https://git.openjdk.org/jfx/pull/1800#discussion_r3269817001 PR Review Comment: https://git.openjdk.org/jfx/pull/1800#discussion_r3269831627
