From d73fd18294188e15222cf1a9a3212e8362ceb4e4 Mon Sep 17 00:00:00 2001
From: Ming Ming <nkming2@gmail.com>
Date: Sun, 20 Oct 2024 18:36:32 +0800
Subject: [PATCH] Remove padding from Draggable

---
 app/lib/widget/collection_browser/view.dart |  8 +++-
 app/lib/widget/draggable.dart               | 41 ++++++++++-----------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/lib/widget/collection_browser/view.dart b/app/lib/widget/collection_browser/view.dart
index 890ac18d..1aad5f01 100644
--- a/app/lib/widget/collection_browser/view.dart
+++ b/app/lib/widget/collection_browser/view.dart
@@ -113,9 +113,13 @@ class _EditContentList extends StatelessWidget {
                     .getThumbSize(zoomLevel.requireData)
                     .toDouble(),
                 items: state.editTransformedItems ?? state.transformedItems,
-                itemBuilder: (context, _, item) => item.buildWidget(context),
+                itemBuilder: (context, _, item) => Padding(
+                  padding: const EdgeInsets.all(8),
+                  child: item.buildWidget(context),
+                ),
                 itemDragFeedbackBuilder: (context, _, item) =>
-                    item.buildDragFeedbackWidget(context),
+                    item.buildDragFeedbackWidget(context) ??
+                    item.buildWidget(context),
                 staggeredTileBuilder: (_, item) => item.staggeredTile,
                 onDragResult: (results) {
                   context.addEvent(_EditManualSort(results));
diff --git a/app/lib/widget/draggable.dart b/app/lib/widget/draggable.dart
index e25b6ae0..75cfd0d8 100644
--- a/app/lib/widget/draggable.dart
+++ b/app/lib/widget/draggable.dart
@@ -41,32 +41,29 @@ class Draggable<T extends Object> extends StatelessWidget {
     return Stack(
       fit: StackFit.expand,
       children: [
-        Padding(
-          padding: const EdgeInsets.all(8),
-          child: LongPressDraggable<T>(
-            data: data,
-            dragAnchorStrategy: pointerDragAnchorStrategy,
-            onDragStarted: onDragStarted,
-            onDragEnd: (_) => onDragEndedAny?.call(),
-            onDragCompleted: onDragEndedAny,
-            onDraggableCanceled: (v, o) => onDragEndedAny?.call(),
-            feedback: FractionalTranslation(
-              translation: const Offset(-.5, -.5),
-              child: SizedBox(
-                width: feedbackSize?.width ?? 128,
-                height: feedbackSize?.height ?? 128,
-                child: Opacity(
-                  opacity: .5,
-                  child: feedback ?? child,
-                ),
+        LongPressDraggable<T>(
+          data: data,
+          dragAnchorStrategy: pointerDragAnchorStrategy,
+          onDragStarted: onDragStarted,
+          onDragEnd: (_) => onDragEndedAny?.call(),
+          onDragCompleted: onDragEndedAny,
+          onDraggableCanceled: (v, o) => onDragEndedAny?.call(),
+          feedback: FractionalTranslation(
+            translation: const Offset(-.5, -.5),
+            child: SizedBox(
+              width: feedbackSize?.width ?? 128,
+              height: feedbackSize?.height ?? 128,
+              child: Opacity(
+                opacity: .5,
+                child: feedback ?? child,
               ),
             ),
-            childWhenDragging: Opacity(
-              opacity: .25,
-              child: child,
-            ),
+          ),
+          childWhenDragging: Opacity(
+            opacity: .25,
             child: child,
           ),
+          child: child,
         ),
         if (onDropBefore != null || onDropAfter != null)
           Positioned.fill(