twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-01-15 19:48:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #4

Browse source
This commit is contained in:
otsmr 2025-02-10 22:31:22 +01:00
parent 645eb452c6
commit ea7b29f594
2 changed files with 61 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/src/components/image_editor/layers/emoji_layer.dart
View file

@ -19,8 +19,11 @@ class EmojiLayer extends StatefulWidget {
class _EmojiLayerState extends State<EmojiLayer> { class _EmojiLayerState extends State<EmojiLayer> {
double initialRotation = 0; double initialRotation = 0;
Offset initialOffset = Offset.zero; Offset initialOffset = Offset.zero;
Offset initialFocalPoint = Offset.zero;
double initialScale = 1.0; double initialScale = 1.0;
bool twoPointerWhereDown = false;
final GlobalKey _key = GlobalKey(); final GlobalKey _key = GlobalKey();
int pointers = 0;
@override @override
void initState() { void initState() {
@ -43,28 +46,51 @@ class _EmojiLayerState extends State<EmojiLayer> {
return Positioned( return Positioned(
left: widget.layerData.offset.dx, left: widget.layerData.offset.dx,
top: widget.layerData.offset.dy, top: widget.layerData.offset.dy,
child: Listener(
onPointerUp: (details) {
setState(() {
pointers--;
if (pointers == 0) {
twoPointerWhereDown = false;
}
});
},
onPointerDown: (details) {
setState(() {
pointers++;
});
},
child: GestureDetector( child: GestureDetector(
onTap: () {},
onScaleStart: (details) { onScaleStart: (details) {
// Store the initial scale and rotation // Store the initial scale and rotation
initialScale = widget.layerData.size; // Reset initial scale initialScale = widget.layerData.size; // Reset initial scale
initialRotation = widget.layerData.rotation; initialRotation = widget.layerData.rotation;
initialOffset = widget.layerData.offset; initialOffset = widget.layerData.offset;
initialFocalPoint =
Offset(details.focalPoint.dx, details.focalPoint.dy);
setState(() {});
}, },
onScaleUpdate: (details) { onScaleUpdate: (details) {
if (twoPointerWhereDown == true && details.pointerCount != 2) {
return;
}
setState(() { setState(() {
// Update the size based on the scale factor // Update the size based on the scale factor
twoPointerWhereDown = details.pointerCount >= 2;
widget.layerData.size = initialScale * details.scale; widget.layerData.size = initialScale * details.scale;
// Update the rotation based on the rotation angle // Update the rotation based on the rotation angle
widget.layerData.rotation = initialRotation + details.rotation; widget.layerData.rotation = initialRotation + details.rotation;
// Update the position based on the translation // Update the position based on the translation
final RenderBox renderBox = var dx = (initialOffset.dx) +
_key.currentContext?.findRenderObject() as RenderBox; (details.focalPoint.dx - initialFocalPoint.dx);
var dx = details.focalPoint.dx - (renderBox.size.width / 2); var dy = (initialOffset.dy) +
var dy = details.focalPoint.dy - (renderBox.size.height / 2 + 34); (details.focalPoint.dy - initialFocalPoint.dy);
// var dy = details.focalPoint.dy - (renderBox.size.height / 2 + 34);
widget.layerData.offset = Offset(dx, dy); widget.layerData.offset = Offset(dx, dy);
}); });
}, },
@ -75,7 +101,7 @@ class _EmojiLayerState extends State<EmojiLayer> {
key: _key, key: _key,
angle: widget.layerData.rotation, angle: widget.layerData.rotation,
child: Container( child: Container(
padding: const EdgeInsets.all(34), padding: const EdgeInsets.all(44),
color: Colors.transparent, color: Colors.transparent,
child: Text( child: Text(
widget.layerData.text.toString(), widget.layerData.text.toString(),
@ -86,6 +112,7 @@ class _EmojiLayerState extends State<EmojiLayer> {
), ),
), ),
), ),
),
); );
} }
} }

1
lib/src/components/image_editor/modules/all_emojis.dart
View file

@ -51,7 +51,6 @@ class _EmojisState extends State<Emojis> {
context, context,
EmojiLayerData( EmojiLayerData(
text: emoji, text: emoji,
size: 32.0,
), ),
); );
}, },