Merge pull request #21 from tichise/feature/viewmodel

不要な変数を削除
tichise · Jan 8, 2024 · a4fd6f2 · a4fd6f2
2 parents 7c9a372 + 41edb52
commit a4fd6f2
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/Sources/OMJoyStick.swift b/Sources/OMJoyStick.swift
@@ -51,14 +51,6 @@ public struct OMJoystick: View {
 
     let iconPadding: CGFloat = 10
 
-    var smallRingDiameter: CGFloat {
-        return smallRingRadius*2
-    }
-
-    var bigRingDiameter: CGFloat {
-        return bigRingRadius*2
-    }
-
     var smallRingRadius: CGFloat
     var bigRingRadius: CGFloat
 
@@ -170,9 +162,9 @@ public struct OMJoystick: View {
                     BigRing(
                         bigRingNormalBackgroundColor: bigRingNormalBackgroundColor,  bigRingDarkBackgroundColor: bigRingDarkBackgroundColor, 
                         bigRingStrokeColor: bigRingStrokeColor,
-                        bigRingDiameter: bigRingDiameter).environmentObject(viewModel).gesture(dragGesture)
+                        bigRingDiameter: bigRingRadius*2).environmentObject(viewModel).gesture(dragGesture)
 
-                    SmallRing(smallRingDiameter: self.smallRingDiameter, subRingColor: subRingColor).offset(x: smallRingLocationX, y: smallRingLocationY).environmentObject(viewModel).allowsHitTesting(false)
+                    SmallRing(smallRingDiameter: smallRingRadius*2, subRingColor: subRingColor).offset(x: smallRingLocationX, y: smallRingLocationY).environmentObject(viewModel).allowsHitTesting(false)
                 }
 
                 rightIcon?.renderingMode(.template)