WIP: VSE: Text editing in preview #127239

Draft

Richard Antalik wants to merge 89 commits from iss/blender:text-edit-2 into main

pull from: iss/blender:text-edit-2

merge into: blender:main

blender:main

blender:blender-v4.3-release

blender:blender-v3.6-release

blender:blender-v4.2-release

blender:npr-prototype

blender:build-oiio-jpeg-fix

blender:pr-abs-path-fix-2

blender:temp-sculpt-dyntopo

blender:icons-cleanup

blender:blender-v3.3-release

blender:brush-assets-project

blender:pr-extensions-tidy-space

blender:blender-v4.0-release

blender:universal-scene-description

blender:blender-v4.1-release

blender:blender-v3.6-temp_wmoss_animrig_public

blender:gpencil-next

blender:anim/animation-id-113594

blender:blender-projects-basics

blender:bridge-curves

blender:sculpt-blender

blender:asset-browser-frontend-split

blender:asset-shelf

blender:tmp-usd-python-mtl

blender:tmp-usd-3.6

blender:blender-v3.5-release

blender:blender-v2.93-release

blender:realtime-clock

blender:sculpt-dev

blender:bevelv2

blender:xr-dev

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

Conversation 8 Commits 89 Files Changed 16 +1350 -89

Richard Antalik commented 2024-09-06 13:01:08 +02:00

Member

Copy Link

So far this is very basic implementation of text editing. Expect crashes as well.

Known bugs so far (TODO):

• Scaled or rotated text can not be edited this way
• The text input is overridden by toolbar keymap
• Fix warnings in console

So far this is very basic implementation of text editing. Expect crashes as well. Known bugs so far (TODO): - Scaled or rotated text can not be edited this way - The text input is overridden by toolbar keymap - Fix warnings in console

Richard Antalik added 32 commits 2024-09-06 13:01:18 +02:00

WIP: VSE: Draw text effect character by character ... 7eacf9a336

This PR changes how effect strip draws text. It builds cache, where
position and width of each character is stored. This is necessary for
efficient implementation of text editing in preview

In addition, position and width of each line is stored. This allows to
implement proper text alignment feature, instead of existing anchoring.

This cache is implemented on VSE side, and takes over 2 aspects of text
rendering:
 - Positioning of individual characters (no changes compared to main)
 - Word wrapping (currently buggy)
This approach seems to be used in 3D viewport as well.

TODO:
Anchoring feature may be part of this PR, but can be also committed
separately

More efficient word wrapping 42e9e6a183

Implement propper alignment 5fc9b7ca9d

Add text boundbox to runtime data, restore box and shadow features 5acdb16ddf

Use rcti for text boundbox, since all other code uses it. 924502772c

Some cleanup 2efff58724

Fix build errors 2128665747

More cleanup 259da00596

Add struct CharInfo, and make the code bit nicer. 96637a1a21

cache memory management and invalidation f06eae946a

Change icons and label to alignment f4c59d3064

Mostly UI changes 99ede841cd

Rename Anchor to Alignment 95723e991e

Fix incorrect character width 2a84da041f

Cleanup 3d63a40630

Change how X alignment works bd959182ec

Fix center X alignment fc5e8c7ff0

Rremove vertical alignment 20d253f111

Remove vertical alignment ffe9fb2f39

Cleanup 3496104a6d

Fix text box not centered vertically e71ddc6087

Fix disabling wrapping 42830d6e6b

Merge branch 'main' into text-edit 941a4788cb

Remove unnecessary using directive e9512bbd36

Remove outdated todo comment 373ab82805

VSE: Text editing in preview 10463065aa

Changes from future 9e83f21152

Merge branch 'text-edit' into text-edit-2 145230c5ac

It's too early for descriptive commit messages 9a17b813a3

Add text input ce3082851b

Add line breaks dbe2767a10

Make text quad conform to boundbox d3c0a8fa8c

Richard Antalik commented 2024-09-06 13:02:02 +02:00

Author

Member

Copy Link

@blender-bot package

@blender-bot package

Blender Bot commented 2024-09-06 13:02:07 +02:00

Member

Copy Link

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR127239) when ready.

Richard Antalik added 6 commits 2024-09-06 15:36:47 +02:00

Changes from future e373f184f9

Remove unintended file 8739a8d5d5

Fix broken line wrapping - it should be wrapping before text overflows, not after the fact. Also removed ignoring of spaces, since it seems to be not great for text editing PR. 100e9a6189

Merge branch 'text-edit' into text-edit-2 51359541a7

Use wrap width to define textbox width 58b9f15468

Disable early out for text, until I find better solution 0ee01cfbdb

Richard Antalik added 1 commit 2024-09-06 18:31:43 +02:00

Add more cursor movement modes 2b81d7452e

Richard Antalik referenced this pull request 2024-09-11 18:14:12 +02:00

VSE: Add text alignment feature #126660

Richard Antalik added 3 commits 2024-09-18 06:49:51 +02:00

Fix some characters not caught by text insert operator. Capital B still not working... 0d052845b1

Implement selection f5cdbac2bb

Cancel selection when editing text 736f6a72e9

Richard Antalik added 1 commit 2024-09-18 08:06:46 +02:00

Implement overwriting and minor cleanup ce1c1feadc

Richard Antalik added 3 commits 2024-09-18 08:27:09 +02:00

Implement select_all operator 87a229b54b

Cherry pick changes from upstream d82f2c0c3a

Implement deselect all operator a6c3c2b7cb

Richard Antalik commented 2024-09-18 08:28:26 +02:00

Author

Member

Copy Link

@blender-bot package

@blender-bot package

Blender Bot commented 2024-09-18 08:28:30 +02:00

Member

Copy Link

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR127239) when ready.

Richard Antalik added 3 commits 2024-09-19 08:18:45 +02:00

Add text editing active/inactive distinction [WIP] 262db88b51

Add toggle text editing mode operator. Wasn't able to come up with way to switch the modes just by mouse selection. bdd1ba3d78

Add more support for image translation, fix some bugs d1e517f753

Richard Antalik added 2 commits 2024-09-19 11:38:47 +02:00

Implement mouse selection c92225e53b

Make cursor blue d38de3b76d

Richard Antalik commented 2024-09-19 11:39:01 +02:00

Author

Member

Copy Link

@blender-bot package

@blender-bot package

Blender Bot commented 2024-09-19 11:40:48 +02:00

Member

Copy Link

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR127239) when ready.

Richard Antalik added 1 commit 2024-09-21 18:13:20 +02:00

Implement copy/cut/paste operators, bit of code simplification 017f66a782

Richard Antalik added 2 commits 2024-09-23 09:47:01 +02:00

Fix handling del key by text insert operator on MacOS b548bcffa2

Make text quad conform to text boundbox instead of word wrapping in X axis 5ab4875856

Richard Antalik added 1 commit 2024-09-23 13:43:40 +02:00

Use default text box size for empty text b51616d4ed

Richard Antalik added 4 commits 2024-09-24 11:20:56 +02:00

Fix boundbox size 9041fc8ba3

Add text editing keymap to box select tool 436b8e3525

Pad box by descender on X axis to make box symmetrical ac814f6b10

Make default box less jumpy when changing font size. 61e2d86e2a

Richard Antalik commented 2024-09-24 11:26:51 +02:00

Author

Member

Copy Link

@blender-bot package

@blender-bot package

Blender Bot commented 2024-09-24 11:26:55 +02:00

Member

Copy Link

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR127239) when ready.

Richard Antalik referenced this pull request 2024-10-03 11:06:46 +02:00

VSE: Add text alignment feature #126660

Richard Antalik added 28 commits 2024-10-05 11:06:28 +02:00

Fix uninitialized value of CharInfo, create runtime data for each frame 6073b48ea4

Merge branch 'main' into text-edit 932c4e829e

Changes from future: Use int2 to pass screen size instead of ibuf 1a824b79cc

Make text box symmetrical 9fd7ab35d3

Sprinkle consts 50a40fe9a6

Merge branch 'text-edit' of projects.blender.org:iss/blender into text-edit c07440f46f

Fix missed conflict 1daefcc513

Merge branch 'main' into text-edit 4287a49865

Merge branch 'main' into text-edit 9c909084b4

Revert removal of anchor properties 8eb9ad6778

Move anchor values to new DNA fields 9f4f420636

Add new property for alignment c062aba510

Merge branch 'main' into text-edit 05ed14f926

Fix build warning 0b325d5773

Merge branch 'main' into text-edit c45e8756e3

Remove unused fields from CharInfo e5ba99e796

Remove unused fields from runtime struct ad6b63802e

Fix text box not following anchoring f274862576

Set alignment in old files to left, so files aren't broken 7f65cbcb91

Match old text boundbox more closely 172bfa0215

Fix "incorrect" text boundbox - Now it matches BLF_boundbox() on per-line basis. 2b25e91eb0

Merge branch 'main' into text-edit 39378bafa0

Fix 1px drawing offset. 7c11f75950

Fix boundbox 1px offset 2cfef9ad68

Address review 75cdcedd69

Improve text alignment tooltip 33c48215f6

Merge branch 'main' into text-edit-2 7d00d15cf8

Merge branch 'text-edit' into text-edit-2 d2439d93c5

Richard Antalik added 2 commits 2024-10-14 06:15:20 +02:00

Merge branch 'main' into text-edit-2 49902683fe

Support for editing transformed text 7abfd51167

This pull request is marked as a work in progress.

This branch is out-of-date with the base branch

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u text-edit-2:iss-text-edit-2

git checkout iss-text-edit-2

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Interest

Alembic

  

Interest

Animation & Rigging

  

Interest

Asset System

Asset datablocks, libraries, browser and shelf

  

Interest

Audio

  

Interest

Automated Testing

  

Interest

Blender Asset Bundle

  

Interest

BlendFile

  

Interest

Collada

  

Interest

Compatibility

Backward and forward compatibility

  

Interest

Compositing

  

Interest

Core

  

Interest

Cycles

  

Interest

Dependency Graph

  

Interest

Development Management

  

Interest

EEVEE

  

Interest

Freestyle

  

Interest

Geometry Nodes

  

Interest

Grease Pencil

  

Interest

ID Management

  

Interest

Images & Movies

  

Interest

Import Export

  

Interest

Line Art

  

Interest

Masking

  

Interest

Metal

  

Interest

Modeling

  

Interest

Modifiers

  

Interest

Motion Tracking

  

Interest

Nodes & Physics

  

Interest

OpenGL

  

Interest

Overlay

  

Interest

Overrides

  

Interest

Performance

  

Interest

Physics

  

Interest

Pipeline, Assets & IO

  

Interest

Platforms, Builds & Tests

  

Interest

Python API

  

Interest

Render & Cycles

  

Interest

Render Pipeline

  

Interest

Sculpt, Paint & Texture

  

Interest

Text Editor

  

Interest

Translations

  

Interest

Triaging

  

Interest

Undo

  

Interest

USD

  

Interest

User Interface

  

Interest

UV Editing

  

Interest

VFX & Video

  

Interest

Video Sequencer

  

Interest

Viewport & EEVEE

  

Interest

Virtual Reality

  

Interest

Vulkan

  

Interest

Wayland

Wayland windowing on Unix

  

Interest

Workbench

  

Interest: X11

Xorg/X11 windowing

  

Legacy

Asset Browser Project

Archived

  

Legacy

Blender 2.8 Project

Archived

  

Legacy

Milestone 1: Basic, Local Asset Browser

Archived

  

Legacy

OpenGL Error

Archived

  

Meta

Good First Issue

  

Meta

Papercut

  

Meta

Retrospective

  

Meta

Security

Related to security, https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  

Module

Animation & Rigging

  

Module

Core

  

Module

Development Management

  

Module

Grease Pencil

  

Module

Modeling

  

Module

Nodes & Physics

  

Module

Pipeline, Assets & IO

  

Module

Platforms, Builds & Tests

  

Module

Python API

  

Module

Render & Cycles

  

Module

Sculpt, Paint & Texture

  

Module

Triaging

  

Module

User Interface

  

Module

VFX & Video

  

Module

Viewport & EEVEE

  

Platform

FreeBSD

  

Platform

Linux

  

Platform

macOS

  

Platform

Windows

  

Severity

High

  

Severity

Low

  

Severity

Normal

  

Severity

Unbreak Now!

  

Status

Archived

  

Status

Confirmed

  

Status

Duplicate

  

Status

Needs Info from Developers

  

Status

Needs Information from User

  

Status

Needs Triage

  

Status

Resolved

  

Type

Bug

  

Type

Design

  

Type

Known Issue

  

Type

Patch

Archived

  

Type

Report

Archived

  

Type

To Do

No Label

Interest

Alembic

Interest

Animation & Rigging

Interest

Asset System

Interest

Audio

Interest

Automated Testing

Interest

Blender Asset Bundle

Interest

BlendFile

Interest

Collada

Interest

Compatibility

Interest

Compositing

Interest

Core

Interest

Cycles

Interest

Dependency Graph

Interest

Development Management

Interest

EEVEE

Interest

Freestyle

Interest

Geometry Nodes

Interest

Grease Pencil

Interest

ID Management

Interest

Images & Movies

Interest

Import Export

Interest

Line Art

Interest

Masking

Interest

Metal

Interest

Modeling

Interest

Modifiers

Interest

Motion Tracking

Interest

Nodes & Physics

Interest

OpenGL

Interest

Overlay

Interest

Overrides

Interest

Performance

Interest

Physics

Interest

Pipeline, Assets & IO

Interest

Platforms, Builds & Tests

Interest

Python API

Interest

Render & Cycles

Interest

Render Pipeline

Interest

Sculpt, Paint & Texture

Interest

Text Editor

Interest

Translations

Interest

Triaging

Interest

Undo

Interest

USD

Interest

User Interface

Interest

UV Editing

Interest

VFX & Video

Interest

Video Sequencer

Interest

Viewport & EEVEE

Interest

Virtual Reality

Interest

Vulkan

Interest

Wayland

Interest

Workbench

Interest: X11

Legacy

Asset Browser Project

Legacy

Blender 2.8 Project

Legacy

Milestone 1: Basic, Local Asset Browser

Legacy

OpenGL Error

Meta

Good First Issue

Meta

Papercut

Meta

Retrospective

Meta

Security

Module

Animation & Rigging

Module

Core

Module

Development Management

Module

Grease Pencil

Module

Modeling

Module

Nodes & Physics

Module

Pipeline, Assets & IO

Module

Platforms, Builds & Tests

Module

Python API

Module

Render & Cycles

Module

Sculpt, Paint & Texture

Module

Triaging

Module

User Interface

Module

VFX & Video

Module

Viewport & EEVEE

Platform

FreeBSD

Platform

Linux

Platform

macOS

Platform

Windows

Severity

High

Severity

Low

Severity

Normal

Severity

Unbreak Now!

Status

Archived

Status

Confirmed

Status

Duplicate

Status

Needs Info from Developers

Status

Needs Information from User

Status

Needs Triage

Status

Resolved

Type

Bug

Type

Design

Type

Known Issue

Type

Patch

Type

Report

Type

To Do

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#127239

No description provided.