Skip to content
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.

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

Add: a TextColour flag to ignore colour changes from strings #7845

Merged
merged 1 commit into from Dec 23, 2019

Conversation

@glx22
Copy link
Contributor

glx22 commented Nov 26, 2019

Passing a TextColor to DrawString() calls only set the initial colour used to draw a string. If the string contains colour changes, the text will be drawn using this new colour. This PR introduces TC_FORCED flag to use in combination with the TextColor (eg TC_RED | TC_FORCED) when calling DrawString().

This change is mainly requested for #7843 but could be used in other places too.

@LordAro
Copy link
Member

LordAro commented Nov 27, 2019

For those not on irc, and perhaps more importantly future us in a week's time, can you explain why you're adding this, and how it's used?

@glx22
Copy link
Contributor Author

glx22 commented Nov 27, 2019

Edited the first comment.

@LordAro LordAro merged commit 42144ec into OpenTTD:master Dec 23, 2019
8 checks passed
8 checks passed
OpenTTD CI #20191126.1 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@glx22 glx22 deleted the glx22:forced_colour branch Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.