AtlasEngine: Improve robustness against weird font sizes #17258
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
zadjii-msft
approved these changes
May 13, 2024
|
Audit mode go boom |
DHowett
approved these changes
May 13, 2024
| @@ -404,9 +404,9 @@ namespace Microsoft::Console::Render::Atlas | |||
| til::generational<CursorSettings> cursor; | |||
| til::generational<MiscellaneousSettings> misc; | |||
| // Size of the viewport / swap chain in pixel. | |||
| u16x2 targetSize{ 1, 1 }; | |||
| u16x2 targetSize{ 0, 0 }; | |||
There was a problem hiding this comment.
make sure HwndTerminal doesn't implode here!
There was a problem hiding this comment.
This is not relevant for HwndTerminal or ControlCore. The problem here is that before bumping the generational revision I check if the targetSize is different and for a target of 1x1 pixel this won't work.
|
Added to 1.20 as well |
DHowett
approved these changes
May 14, 2024
DHowett
pushed a commit
that referenced
this pull request
May 17, 2024
This clamps the font sizes between 1 and 100. Additionally, it fixes a warning that I randomly noticed when reproducing the issue: D2D complained that `EndDraw` must be called before releasing resources. Finally, this fixes a crash when the terminal size is exactly (1,1) cells, which happened because the initial (invalid) size was (1,1) too. This doesn't fully fix all font-size related issues, but that's currently difficult to achieve, as for instance the swap chain size isn't actually based on the window size, nay, it's based on the cell size multiplied by the cell count. So if the cell size is egregiously large then we get a swap chain size that's larger than the display and potentially larger than what the GPU supports which results in errors. Closes #17227 (cherry picked from commit f62d2d5) Service-Card-Id: 92546470 Service-Version: 1.21
DHowett
pushed a commit
that referenced
this pull request
May 17, 2024
This clamps the font sizes between 1 and 100. Additionally, it fixes a warning that I randomly noticed when reproducing the issue: D2D complained that `EndDraw` must be called before releasing resources. Finally, this fixes a crash when the terminal size is exactly (1,1) cells, which happened because the initial (invalid) size was (1,1) too. This doesn't fully fix all font-size related issues, but that's currently difficult to achieve, as for instance the swap chain size isn't actually based on the window size, nay, it's based on the cell size multiplied by the cell count. So if the cell size is egregiously large then we get a swap chain size that's larger than the display and potentially larger than what the GPU supports which results in errors. Closes #17227 (cherry picked from commit f62d2d5) Service-Card-Id: 92546859 Service-Version: 1.20
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.
This clamps the font sizes between 1 and 100. Additionally, it fixes
a warning that I randomly noticed when reproducing the issue: D2D
complained that
EndDrawmust be called before releasing resources.Finally, this fixes a crash when the terminal size is exactly (1,1)
cells, which happened because the initial (invalid) size was (1,1) too.
This doesn't fully fix all font-size related issues, but that's
currently difficult to achieve, as for instance the swap chain size
isn't actually based on the window size, nay, it's based on the cell
size multiplied by the cell count. So if the cell size is egregiously
large then we get a swap chain size that's larger than the display and
potentially larger than what the GPU supports which results in errors.
Closes #17227