From 980dc8125bced122e5a2dc3938915cb83068336e Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Tue, 14 Oct 2025 18:07:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=BC=EC=AA=BD=20=EC=9C=84=EC=AA=BD=20?=
 =?UTF-8?q?=EC=97=AC=EB=B0=B1=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/screen/ScreenDesigner.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/components/screen/ScreenDesigner.tsx b/frontend/components/screen/ScreenDesigner.tsx
index 3cc44250..34f65eda 100644
--- a/frontend/components/screen/ScreenDesigner.tsx
+++ b/frontend/components/screen/ScreenDesigner.tsx
@@ -148,7 +148,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
     gridSettings: {
       columns: 12,
       gap: 16,
-      padding: 16,
+      padding: 0,
       snapToGrid: true,
       showGrid: true,
       gridColor: "#d1d5db",
@@ -942,14 +942,14 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
             const layoutWithDefaultGrid = {
               ...layoutToUse,
               gridSettings: {
+                ...layoutToUse.gridSettings, // 기존 설정 먼저 적용
                 columns: 12,
                 gap: 16,
-                padding: 16,
+                padding: 0, // padding은 항상 0으로 강제
                 snapToGrid: true,
                 showGrid: true,
                 gridColor: "#d1d5db",
                 gridOpacity: 0.5,
-                ...layoutToUse.gridSettings, // 기존 설정이 있으면 덮어쓰기
               },
             };
 
@@ -1415,7 +1415,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
               borderStyle: "solid",
               borderColor: "#e5e7eb",
               borderRadius: 8,
-              padding: 16,
+              padding: 0,
               margin: 0,
               shadow: "sm",
               ...(templateComp as any).areaStyle,
@@ -3010,7 +3010,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
           layout.gridSettings || {
             columns: 12,
             gap: 16,
-            padding: 16,
+            padding: 0,
             snapToGrid: true,
             showGrid: true,
             gridColor: "#d1d5db",
@@ -3947,7 +3947,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
             };
             e.dataTransfer.setData("application/json", JSON.stringify(dragData));
           }}
-          gridSettings={layout.gridSettings || { columns: 12, gap: 16, padding: 16, snapToGrid: true }}
+          gridSettings={layout.gridSettings || { columns: 12, gap: 16, padding: 0, snapToGrid: true }}
           screenResolution={screenResolution}
         />
       </FloatingPanel>
@@ -4053,10 +4053,10 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
         autoHeight={true}
       >
         <GridPanel
-          gridSettings={layout.gridSettings || { columns: 12, gap: 16, padding: 16, snapToGrid: true, showGrid: true }}
+          gridSettings={layout.gridSettings || { columns: 12, gap: 16, padding: 0, snapToGrid: true, showGrid: true }}
           onGridSettingsChange={updateGridSettings}
           onResetGrid={() => {
-            const defaultSettings = { columns: 12, gap: 16, padding: 16, snapToGrid: true, showGrid: true };
+            const defaultSettings = { columns: 12, gap: 16, padding: 0, snapToGrid: true, showGrid: true };
             updateGridSettings(defaultSettings);
           }}
           onForceGridUpdate={handleForceGridUpdate}