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

Made a change to the popup to fix text being cut off at low resolutions. #73678

Merged
merged 1 commit into from
May 12, 2024

Conversation

katemonster33
Copy link
Contributor

Summary

Bugfixes "Tutorial screen popup text no longer cuts off"

Purpose of change

Fixes: #73367

Describe the solution

Disable word wrapping on the ImGui drawing side, instead relying on the foldstring method to perform those calculations ahead of time, this reduces CPU usage while also fixing the issue.

Describe alternatives you've considered

Testing

Load tutorial, verify that at lowest resolution, the tutorial text is no longer cutoff.

Additional context

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` labels May 11, 2024
src/popup.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label May 11, 2024
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 12, 2024
@dseguin dseguin merged commit b345d8e into CleverRaven:master May 12, 2024
18 of 25 checks passed
GuardianDll added a commit to GuardianDll/Cataclysm-DDA that referenced this pull request May 15, 2024
Squashed commit:

[795be74] TamableWildlife Skunk Friends (CleverRaven#73645)

[b345d8e] Made a change to the popup to fix text being cut off at low resolutions. (CleverRaven#73678)

[0a771f6] [Magiclysm] New joke spell (CleverRaven#73251)

* Spell creation plus scroll plus addition to existing book plus spawn for scroll

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>

* fix ellipsis

* fix formatting error

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>

[9017632] Increase feral clairsentient dodge

[0adfdf1] [MoM] Normalize feral biokinetic HP (CleverRaven#73635)

* Fix HP

* Fix HP

[1a8080a] Added Bronze Wood Saw to Misc Repair Kit Craft (CleverRaven#73654)

[59351db] #include vector in cata_imgui.h (CleverRaven#73681)

[cabc0eb] style

[e876fae] Provided 3D camp construction + Livestock 2 example

[bc9c909] Use dummy parser for attack_vector to fix string extraction script error (CleverRaven#73659)

[15c4984] typified animation.cpp (CleverRaven#73609)

[548059a] test
SurFlurer added a commit to SurFlurer/Cataclysm-DDA that referenced this pull request Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tutorial text window cuts off text
2 participants