Fixed the inner shadow offset

- Fixed the size of inner shadow offset. It is too large when the width of the shape is larger than its height. - Updated the demo.
costachung · Nov 18, 2020 · 143b67e · 143b67e
1 parent 7b50c23
commit 143b67e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Sources/Neumorphic/SoftInnerShadowViewModifier.swift b/Sources/Neumorphic/SoftInnerShadowViewModifier.swift
@@ -32,7 +32,7 @@ private struct SoftInnerShadowViewModifier<S: Shape> : ViewModifier {
     }
 
     fileprivate func shadowOffset(_ geo: GeometryProxy) -> CGFloat {
-        return geo.size.width * 0.5 * min(max(spread, 0), 1)
+        return (geo.size.width <= geo.size.height ? geo.size.width : geo.size.height) * 0.5 * min(max(spread, 0), 1)
     }
 
 

diff --git a/neumorphic-ios-example/neumorphic-ios-example/SoftButtonDemoView.swift b/neumorphic-ios-example/neumorphic-ios-example/SoftButtonDemoView.swift
@@ -49,6 +49,13 @@ struct SoftButtonDemoView: View {
                             }.softButtonStyle(Circle(), mainColor: Color.red, textColor: Color.white, darkShadowColor: Color("redButtonDarkShadow"), lightShadowColor:Color("redButtonLightShadow"))
                         }
 
+                        Button(action: {}) {
+                            Text("Custom Size")
+                                .fontWeight(.bold)
+                                .frame(width: 300, height: 20)
+                        }
+                        .softButtonStyle(Capsule(), padding: 15)
+
 
                         HStack {
                             Button(action: {}) {
@@ -93,9 +100,14 @@ struct SoftButtonDemoView: View {
                         .background(
                             Capsule().fill(Neumorphic.shared.mainColor()).softOuterShadow()
                         )
+
+
+
+
                     }
 
-                }.navigationBarTitle("Soft Button Demo")
+                }
+                .navigationBarTitle("Soft Button Demo")
             }
         }
     }
@@ -105,10 +117,12 @@ struct SoftButtonDemoView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
             SoftButtonDemoView()
-              .environment(\.colorScheme, .light)
+                .navigationViewStyle(StackNavigationViewStyle())
+                .environment(\.colorScheme, .light)
 
             SoftButtonDemoView()
-              .environment(\.colorScheme, .dark)
+                .navigationViewStyle(StackNavigationViewStyle())
+                .environment(\.colorScheme, .dark)
         }
     }
 }