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.

Sign up for GitHub

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

Jump to bottom

Fix: Apply unscaled padding to Viewport inside WWT_INSET. #9219

Merged
merged 1 commit into from
May 8, 2021
Merged

Fix: Apply unscaled padding to Viewport inside WWT_INSET. #9219

merged 1 commit into from
May 8, 2021
+20 −8

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented May 8, 2021

Motivation / Problem

Since pixel dimensions in SetPadding() are scaled by GUI size, padding for inset viewports was excessive as the padding really only wants to be the thickness of the inset border.

Description

Instead of SetPadding(), automatically apply padding for WWT_INSET at widget level. This applies to all widgets inside a WWT_INSET, which in all instances is a NWID_VIEWPORT.

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 affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@PeterN
Fix: Apply unscaled padding to Viewport inside WWT_INSET.
d367474 
Since pixel dimensions in SetPadding() are scaled by GUI size, padding for inset viewports was excessive.

Instead, automatically apply padding for WWT_INSET at widget level. This applies to all widgets inside a WWT_INSET, which in all instances is a NWID_VIEWPORT.
@PeterN
Copy link
Member Author

PeterN commented May 8, 2021

Without this:
insetbefore
With this:
insetafter

LordAro
LordAro approved these changes May 8, 2021
View reviewed changes
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tiniest of differences, sure!

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label May 8, 2021
@PeterN
Copy link
Member Author

PeterN commented May 8, 2021

It's more noticeable at 4x scale, where instead of 1 extra pixel it's 3 extra pixels.

@PeterN PeterN merged commit 330a305 into OpenTTD:master May 8, 2021
@PeterN PeterN deleted the fix-inset-padding branch May 8, 2021 20:01
@TrueBrain TrueBrain removed the backport requested This PR should be backport to current release (RC / stable) label Oct 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LordAro LordAro

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@PeterN @LordAro @TrueBrain