empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix cropping on large images.

Browse source
This commit is contained in:
Michelle Tang 2025-01-13 12:26:36 -05:00 • committed by Cody Henthorne
parent 342b11a3ea
commit 9966bf2fbd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
View file

@ -97,7 +97,7 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
private static final int DRAW_HUD_PROTECTION = ViewUtil.dpToPx(72);
private static final int CROP_HUD_PROTECTION = ViewUtil.dpToPx(144);
private static final int CONTROLS_PROTECTION = ViewUtil.dpToPx(74);
private EditorModel restoredModel;
private Pair<Uri, FaceDetectionResult> cachedFaceDetection;
@ -245,7 +245,7 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
}
int width = getResources().getDisplayMetrics().widthPixels;
int height = (int) ((16 / 9f) * width);
int height = (int) ((16 / 9f) * width) - CONTROLS_PROTECTION;
imageEditorView.setMinimumHeight(height);
imageEditorView.requestLayout();
imageEditorHud.setBottomOfImageEditorView(getResources().getDisplayMetrics().heightPixels - height);
@ -756,7 +756,7 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
int maxHeight = getHeightForOrientation(orientation);
float aspectRatio = getAspectRatioForOrientation(orientation);
int targetWidth = getWidthForOrientation(orientation);
int targetHeight = (int) ((1 / aspectRatio) * targetWidth);
int targetHeight = (int) ((1 / aspectRatio) * targetWidth) - CONTROLS_PROTECTION;
if (targetHeight > maxHeight) {
targetHeight = maxHeight;