AtlasEngine: Harden against empty target sizes #15615
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhecker
added
Issue-Bug
DHowett
approved these changes
Jun 27, 2023
microsoft-github-policy-service
bot
added
the
Needs-Author-Feedback
|
How do you test this? With WpfTerminalTestNetCore? I can't reproduce any issues to begin with... |
microsoft-github-policy-service
bot
added
Needs-Attention
it is dangerous to go alone. take this! https://github.com/microsoft/terminal/tree/dev/duhowett/hax/wpf-atlas |
lhecker
force-pushed
the
dev/lhecker/atlas-engine-fixup
branch
from
d4cccea to
626cdb3
Compare
lhecker
changed the title
lhecker
force-pushed
the
dev/lhecker/atlas-engine-fixup
branch
2 times, most recently
from
96d0c3c to
721dc99
Compare
lhecker
commented
Jun 30, 2023
| gsl::narrow_cast<u16>(clamp<til::CoordType>(pixels.height, 1, u16max)), | ||
| }; | ||
|
|
||
| if (_api.s->targetSize != newSize) |
There was a problem hiding this comment.
This PR now fixes the issue from two directions:
- Avoid ever setting
targetSizeto anything that has a 0 on either width or height
| const auto area = std::min(maxArea, std::min(maxAreaByFont, min)); | ||
|
|
||
| auto area = std::min(maxAreaByFont, std::max(minAreaByFont, minAreaByGrowth)); | ||
| area = clamp(area, minArea, maxArea); |
There was a problem hiding this comment.
- Avoid reducing
areabelowminAreaat all times
(minArea should probably be called absoluteMinArea or something.)
DHowett
approved these changes
Jun 30, 2023
carlos-zamora
approved these changes
Jun 30, 2023
carlos-zamora
added
the
AutoMerge
DHowett
pushed a commit
that referenced
this pull request
Jul 27, 2023
The WPF control has a minor bug where it initializes the renderer when there isn't even a window yet. When it then calls `SetWindowSize` it'll pass the result of `GetWindowRect` which is `0,0,0,0`. This made AtlasEngine unhappy because it restricted the glyph atlas size to some multiple of the window size. If the window size is `0,0` then there couldn't be a glyph atlas and so it crashed. ## Validation Steps Performed * Fixes WPF test control crash on startup ✅ (cherry picked from commit a084834) Service-Card-Id: 90012548 Service-Version: 1.18
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The WPF control has a minor bug where it initializes the renderer
when there isn't even a window yet. When it then calls
SetWindowSizeit'll pass the result of
GetWindowRectwhich is0,0,0,0.This made AtlasEngine unhappy because it restricted the glyph atlas
size to some multiple of the window size. If the window size is
0,0then there couldn't be a glyph atlas and so it crashed.
Validation Steps Performed