i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

People: fix aspect ratio for square images

Browse Source 
If you dropped a square image onto the image well, it was
squashed horizontally.

Change-Id: Ie5637fc242a1c5b7313234a87822bc43556cbe4d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1886
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Humdinger
2019-09-25 23:44:04 +00:00
committed by waddlesplash
parent d2d4866dd4
commit db6fcb750a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/people/PictureView.cpp
+6 -3
View File
@@ -275,10 +275,13 @@ PictureView::Draw(BRect updateRect)
BRect frame = rect.InsetByCopy(kPictureMargin, kPictureMargin); BRect frame = rect.InsetByCopy(kPictureMargin, kPictureMargin);
BRect srcRect = picture->Bounds(); BRect srcRect = picture->Bounds();
BSize size = frame.Size(); BSize size = frame.Size();
if (srcRect.Width() > srcRect.Height()) float pictureAspect = srcRect.Height() / srcRect.Width();
size.height = srcRect.Height() * size.width / srcRect.Width(); float frameAspect = size.height / size.width;
else
if (pictureAspect > frameAspect)
size.width = srcRect.Width() * size.height / srcRect.Height(); size.width = srcRect.Width() * size.height / srcRect.Height();
else if (pictureAspect < frameAspect)
size.height = srcRect.Height() * size.width / srcRect.Width();
fPictureRect = BLayoutUtils::AlignInFrame(frame, size, fPictureRect = BLayoutUtils::AlignInFrame(frame, size,
BAlignment(B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER)); BAlignment(B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));