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

Fix: Off-by-one in EnsureVisibleCaption. #12261

Merged
merged 1 commit into from Mar 10, 2024

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Mar 10, 2024

Motivation / Problem

An off-by-one in EnsureVisibleCaption causes the minimum visible caption height to be 13 scaled pixels and 1 unscaled pixel. At 1x interface scale, this 'happens' to be the complete height of a caption, but at other interface scales it is not.

image

Description

Instead of using a scaled fixed value, correct the off-by-one and just use the window's actual caption height instead.

image

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

src/window.cpp Outdated Show resolved Hide resolved
An off-by-one in EnsureVisibleCaption causes the minimum visible caption height to be 13 scaled pixels and 1 unscaled pixel. At 1x interface scale, this 'happens' to be the complete height of a caption, but at other interface scales it is not.

Instead of using a scaled fixed value, correct the off-by-one and just use the window's actual caption height instead.
@PeterN PeterN force-pushed the fix-ensure-visible-caption branch from 877af2a to 1720de8 Compare March 10, 2024 14:16
@PeterN PeterN enabled auto-merge (squash) March 10, 2024 14:29
@PeterN PeterN merged commit 649c1cf into OpenTTD:master Mar 10, 2024
18 checks passed
@PeterN PeterN deleted the fix-ensure-visible-caption branch March 10, 2024 21:40
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Mar 16, 2024
An off-by-one in EnsureVisibleCaption causes the minimum visible caption height to be 13 scaled pixels and 1 unscaled pixel. At 1x interface scale, this 'happens' to be the complete height of a caption, but at other interface scales it is not.

Instead of using a scaled fixed value, correct the off-by-one and just use the window's actual caption height instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants