Re: [PATCH 1/3] ui/cocoa: Fix aspect ratio

[Akihiko Odaki]

On 2024/03/22 21:22, Peter Maydell wrote:
> On Mon, 18 Mar 2024 at 07:53, Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
> > [NSWindow setContentAspectRatio:] does not trigger window resize itself,
> > so the wrong aspect ratio will persist if nothing resizes the window.
> > Call [NSWindow setContentSize:] in such a case.
> >
> > Fixes: 91aa508d0274 ("ui/cocoa: Let the platform toggle fullscreen")
> > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> > ---
> >   ui/cocoa.m | 23 ++++++++++++++++++++++-
> >   1 file changed, 22 insertions(+), 1 deletion(-)
> >
> > diff --git a/ui/cocoa.m b/ui/cocoa.m
> > index fa879d7dcd4b..d6a5b462f78b 100644
> > --- a/ui/cocoa.m
> > +++ b/ui/cocoa.m
> > @@ -508,6 +508,25 @@ - (void) drawRect:(NSRect) rect
> >       }
> >   }
> >
> > +- (NSSize)fixAspectRatio:(NSSize)original
> > +{
> > +    NSSize scaled;
> > +    NSSize fixed;
> > +
> > +    scaled.width = screen.width * original.height;
> > +    scaled.height = screen.height * original.width;
> > +
> > +    if (scaled.width < scaled.height) {
>
> Is this a standard algorithm for scaling with a fixed
> aspect ratio? It looks rather weird to be comparing
> a width against a height here, and to be multiplying a
> width by a height.

Not sure if it's a standard, but it's an algorithm with least error I 
came up with.

Regards,
Akihiko Odaki

> > +        fixed.width = scaled.width / screen.height;
> > +        fixed.height = original.height;
> > +    } else {
> > +        fixed.width = original.width;
> > +        fixed.height = scaled.height / screen.width;
> > +    }
> > +
> > +    return fixed;
> > +}
> > +
>
> thanks
> -- PMM