Skip to content

Commit 5b3f711

Browse files
fix oval shape edit
1 parent 455099d commit 5b3f711

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

app/src/main/java/com/smarttoolfactory/composecropper/preferences/frames/edit/OvalCropShapeEdit.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,16 @@ internal fun OvalCropShapeEdit(
7171
val left = (width - diameter) / 2
7272
val top = (height - diameter) / 2
7373

74-
7574
val rect = Rect(offset = Offset(left, top), size = Size(diameter, diameter))
76-
// moveTo(size.width / 2, size.height / 2)
77-
// FIXME There is a bug when start angle is 0f and sweep 360f
78-
arcTo(rect, startAngle, sweepAngle, false)
79-
// addArc(rect, startAngle, sweepAngle)
75+
76+
if (sweepAngle == 360f) {
77+
addOval(rect)
78+
} else {
79+
moveTo(size.width / 2, size.height / 2)
80+
arcTo(rect, startAngle, sweepAngle, false)
81+
82+
}
83+
8084
close()
8185
}
8286
}

cropper/src/main/java/com/smarttoolfactory/cropper/settings/CropFrameFactory.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ class CropFrameFactory(private val defaultImages: List<ImageBitmap>) {
5151
)
5252
}
5353

54-
// TODO This should be editable in future releases
5554
OutlineType.Oval -> {
5655
CropFrame(
5756
outlineType = outlineType,
58-
editable = false,
57+
editable = true,
5958
cropOutlineContainer = createCropOutlineContainer(outlineType)
6059
)
6160
}

0 commit comments

Comments
 (0)