From f6bac2f4764d878faff4e37033cd7f32c3a59ba2 Mon Sep 17 00:00:00 2001 From: Clark Chen Date: Tue, 30 May 2023 17:15:00 -0400 Subject: [PATCH] Fix trash can not appearing when editing group photo. --- .../signal/imageeditor/core/model/EditorElementHierarchy.java | 2 +- .../java/org/signal/imageeditor/core/model/EditorModel.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java b/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java index ce9ed01766..c2ec4e0a7b 100644 --- a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java +++ b/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java @@ -183,7 +183,7 @@ final class EditorElementHierarchy { cropEditorElement.addElement(createThumbs(cropEditorElement, renderCenterThumbs)); if (cropStyle == CropStyle.CIRCLE) { - EditorElement circle = new EditorElement(new OvalGuideRenderer(R.color.crop_circle_guide_color)); + EditorElement circle = new EditorElement(new OvalGuideRenderer(R.color.crop_circle_guide_color), EditorModel.Z_CIRCLE); circle.getFlags().setSelectable(false) .persist(); diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java b/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java index db96df900c..3e978923a5 100644 --- a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java +++ b/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java @@ -43,6 +43,7 @@ public final class EditorModel implements Parcelable, RendererContext.Ready { public static final int Z_FADE = 1; public static final int Z_TEXT = 2; public static final int Z_TRASH = 3; + public static final int Z_CIRCLE = 4; private static final Runnable NULL_RUNNABLE = () -> { };