Skip to content

Improve Label underline, strikethrough and color [reverted] #2364

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

Jump to bottom
Merged
merged 58 commits into from
Feb 10, 2025
Merged

Improve Label underline, strikethrough and color [reverted] #2364

merged 58 commits into from
Feb 10, 2025

Conversation

aismann
Copy link
Contributor

@aismann aismann commented Feb 3, 2025 •
edited
Loading

Describe your changes

Improve class Label:

  • underline and strikethrough on the same Label (also multiline)
  • setColor or setTextColor change the color of the Label and the "line" too.
  • SystemFont supports underline and strikethrough too
  • resizing the window resizing the "line" too.

Issue ticket number and link

see #2328

image
image

Checklist before requesting a review

For each PR

  • Add Copyright if it missed:
    - "Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md)."

  • I have performed a self-review of my code.

    Optional:

    • I have checked readme and add important infos to this PR.
    • I have added/adapted some tests too.

For core/new feature PR

  • I have checked readme and add important infos to this PR.
  • I have added thorough tests.

halx99 and others added 30 commits December 10, 2024 01:01
@halx99
Add android 15 for 16 KB page sizes support, refer #2219
c67ce5d
@aismann
Delete core/2d/ParticleExamples.h
7abcbf0
@aismann
Delete core/2d/ParticleExamples.cpp
4bb1c2b
@aismann
Update axmol.h
44ab5e2
@aismann
Revert "Update axmol.h"
3703033 
This reverts commit 44ab5e2.
@aismann
Revert "Delete core/2d/ParticleExamples.h"
9e8a3bb 
This reverts commit 7abcbf0.
@aismann
Revert "Delete core/2d/ParticleExamples.cpp"
798c29f 
This reverts commit 4bb1c2b.
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
04bcd55
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
243bfc7
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
6728b17
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
f1b88be
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
cd24b30
@aismann
Add Documentation_report.md
a4a2144
@aismann
Merge pull request #1 from aismann/Add_Documentation_report_md
896d620 
Add Documentation_report.md
@aismann
Update Documentation_report.md
85d1dc7
@aismann
Merge branch 'axmolengine:dev' into dev
6815d14
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
14cfb74
@aismann
Merge branch 'axmolengine:dev' into dev
eb9f7fd
@aismann
Merge branch 'axmolengine:dev' into dev
404914b
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
3d2b952
@aismann
Merge branch 'axmolengine:dev' into dev
9626cea
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
acbd28d
@aismann
Merge branch 'axmolengine:dev' into dev
1c58f3a
@aismann
Merge branch 'axmolengine:dev' into dev
c884a9d
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
eeb0932
@aismann
Merge branch 'axmolengine:dev' into dev
a98e18a
@aismann
Merge branch 'axmolengine:dev' into dev
e28c1dc
@aismann
Merge branch 'axmolengine:dev' into dev
1c700ce
@aismann
Merge branch 'dev' of https://github.com/aismann/axmol into dev
82c4291
@aismann
.
d378f35
@aismann aismann marked this pull request as ready for review February 6, 2025 11:03
@aismann
Revert "Merge remote-tracking branch 'upstream/dev' into ImproveLabel…
67cd642 
…Stuff"

This reverts commit 08f83f5, reversing
changes made to e114906.
@halx99 halx99 added this to the 2.3.3 milestone Feb 6, 2025
@halx99 halx99 changed the title class Label: Fix/Improve behavior of underline, strikethrough and color Improve Label underline, strikethrough and color Feb 6, 2025
halx99
halx99 requested changes Feb 6, 2025
View reviewed changes
Copy link
Collaborator

@halx99 halx99 left a comment

Choose a reason for hiding this comment

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

Your branch seems to have diverged from the dev branch of main repo, resulting in unnecessary modifications and conflicts. It is recommended that you create a new branch from the latest dev, apply your modifications, and then use force push to your PR branch.

@aismann aismann marked this pull request as draft February 8, 2025 15:07
@aismann aismann marked this pull request as ready for review February 8, 2025 18:07
@aismann
Copy link
Contributor Author

aismann commented Feb 9, 2025

Your branch seems to have diverged from the dev branch of main repo, resulting in unnecessary modifications and conflicts. It is recommended that you create a new branch from the latest dev, apply your modifications, and then use force push to your PR branch.

Should be fixed with the latest PR

@aismann aismann requested a review from halx99 February 9, 2025 07:25
aismann
aismann commented Feb 9, 2025
View reviewed changes
Copy link
Contributor Author

@aismann aismann left a comment

Choose a reason for hiding this comment

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

should be fix with the latest PR

halx99
halx99 reviewed Feb 9, 2025
View reviewed changes
halx99
halx99 reviewed Feb 9, 2025
View reviewed changes
halx99
halx99 reviewed Feb 9, 2025
View reviewed changes
@halx99 halx99 merged commit d209fc6 into axmolengine:dev Feb 10, 2025
15 checks passed
halx99 added a commit that referenced this pull request Feb 10, 2025
@halx99
Improve Label underline, strikethrough and color (#2364)
076ccd4
@aismann aismann mentioned this pull request Feb 10, 2025
Closed
@halx99 halx99 linked an issue Feb 10, 2025 that may be closed by this pull request
Cocos2dx/Axmol 1.0.1: Label issues: 1) Underline/Strikethrough can not use on the same label; 2) Resizing the window is not resizing the line (underline/strikethrough) 3) Line color is not Label color #2328
Closed
@halx99
Copy link
Collaborator

halx99 commented Feb 10, 2025 •
edited
Loading

The outline effect was broken, @aismann please take a look

previous version:
image

latest dev branch:
image

@halx99
Copy link
Collaborator

halx99 commented Feb 10, 2025 •
edited
Loading

I reverted it, you can continue working your own branch, once ready, then create a new PR

@halx99 halx99 changed the title Improve Label underline, strikethrough and color Improve Label underline, strikethrough and color [reverted] Feb 10, 2025
@halx99 halx99 removed a link to an issue Feb 10, 2025
Cocos2dx/Axmol 1.0.1: Label issues: 1) Underline/Strikethrough can not use on the same label; 2) Resizing the window is not resizing the line (underline/strikethrough) 3) Line color is not Label color #2328
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@halx99 halx99 halx99 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@aismann @halx99