Skip to content

Support CJK input#5230

Merged
dacap merged 3 commits into
aseprite:mainfrom
Cerallin:feat/CJK-input-support
Jul 24, 2025
Merged

Support CJK input#5230
dacap merged 3 commits into
aseprite:mainfrom
Cerallin:feat/CJK-input-support

Conversation

@Cerallin

Copy link
Copy Markdown
Contributor

This PR will be a draft until aseprite/laf#147 is merged.

Ref: #1767

I agree that my contributions are licensed under the Individual Contributor License Agreement V4.0 ("CLA") as stated in https://github.com/igarastudio/cla/blob/main/cla.md

I have signed the CLA following the steps given in https://github.com/igarastudio/cla#signing

@Cerallin Cerallin requested a review from dacap as a code owner June 14, 2025 14:33
@Cerallin Cerallin marked this pull request as draft June 14, 2025 14:34
@aseprite-bot

Copy link
Copy Markdown
Collaborator

Hi there!

One or more of the commit messages in this PR do not match our code submission policy, please check the lint_commits CI job for more details on which commits were flagged and why.
Please do not close this PR and open another, instead modify your commit message(s) with git commit --amend and force push those changes to update this PR.

@Cerallin Cerallin force-pushed the feat/CJK-input-support branch from 83df582 to 66b1166 Compare June 14, 2025 14:42
@dacap dacap self-assigned this Jun 24, 2025
@Cerallin Cerallin marked this pull request as ready for review July 9, 2025 15:31
@Cerallin Cerallin changed the title WIP: Support CJK input Support CJK input Jul 9, 2025
@Cerallin Cerallin force-pushed the feat/CJK-input-support branch from b73fba1 to 0e4abdb Compare July 10, 2025 08:34

@aseprite-bot aseprite-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

Comment thread src/ui/entry.cpp Outdated
Comment thread src/ui/entry.cpp Outdated
Comment thread src/ui/entry.cpp
Comment thread src/ui/entry.cpp Outdated
Comment thread src/ui/entry.cpp
Comment thread src/ui/entry.cpp
@dacap

dacap commented Jul 10, 2025

Copy link
Copy Markdown
Member

@Cerallin I've updated the main branch of aseprite to include laf changes, if you rebase your PR and force push the commits, you should have the required changes to pass the checks in this PR.

@Cerallin Cerallin force-pushed the feat/CJK-input-support branch 2 times, most recently from 174f703 to 82d7c03 Compare July 10, 2025 15:57
@aseprite-bot

Copy link
Copy Markdown
Collaborator

clang-tidy review says "All clean, LGTM! 👍"

@dacap dacap added the needs cla The full CLA signing process wasn't completed. label Jul 10, 2025
@dacap

dacap commented Jul 10, 2025

Copy link
Copy Markdown
Member

@Cerallin there are a couple of errors: 1) I've merged the laf changes and now the main branch of aseprite doesn't compile it, so I'll fix it, but 2) the signed CLA doesn't include the email address used in the commits of the PR.

The first change I'll push will make the PR to have conflicts with the main branch.

@Cerallin

Copy link
Copy Markdown
Contributor Author

OK,I will sign the CLA and solve the conflicts tonight.

Cerallin added 2 commits July 11, 2025 10:26
This method is for Entry::setTextInput() and IME positioning.
@Cerallin Cerallin force-pushed the feat/CJK-input-support branch from 82d7c03 to e01bd48 Compare July 11, 2025 02:29
@Cerallin Cerallin force-pushed the feat/CJK-input-support branch from e01bd48 to f04678e Compare July 11, 2025 13:18
@aseprite-bot

Copy link
Copy Markdown
Collaborator

clang-tidy review says "All clean, LGTM! 👍"

@dacap dacap removed the needs cla The full CLA signing process wasn't completed. label Jul 24, 2025
@dacap

dacap commented Jul 24, 2025

Copy link
Copy Markdown
Member

Thanks @Cerallin 👍 I was able to test this and it works great. There is an issue with the Text tool where pressing the Enter key in the IME dialog will finish the Text tool entry, but I'll try to fix that for the release.

@dacap dacap merged commit 6d89a6b into aseprite:main Jul 24, 2025
12 checks passed
@dacap dacap mentioned this pull request Mar 8, 2025
5 tasks
@Cerallin

Copy link
Copy Markdown
Contributor Author

@dacap Thank you very much! I was busy these days, but I will keep up with IME/CJK-display related issues when I am available.

There are some minor issues about IME positioning to be fixed, I will create an issue or a PR later.

And then I may work with IME support on Linux. (I don't have a mac so I can't help there.)

@dacap

dacap commented Jul 24, 2025

Copy link
Copy Markdown
Member

Thank you @Cerallin, I think this is huge first step for most users (which are on Windows platforms). Any other help and PR will be welcomed!

@dacap dacap added this to the v1.3.15 milestone Jul 25, 2025
dacap added a commit that referenced this pull request Jul 25, 2025
With #5230, now that we can show the IME dialog on Windows, when we
are selecting a specific word/composition in the IME dialog, if we
press Enter we'll receive that Enter onKeyUp(). It's better if we
process the Enter key onKeyDown() (as the IME enter key is not
received in that case).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants