Merge branch 'master' into feature/uiblureffect_variable

cockscomb · Mar 17, 2016 · a730a55 · a730a55
2 parents f8e935c + 0ef25d0
commit a730a55
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/HUDKit/Classes/Progress/HUDProgressViewController.swift b/HUDKit/Classes/Progress/HUDProgressViewController.swift
@@ -78,7 +78,12 @@ public class HUDProgressViewController: UIViewController {
         self.status = status
         self.visualEffect = visualEffect
 
-        preferredContentSize = CGSizeMake(100.0, 100.0)
+        if let customView = customView {
+            let insets = UIEdgeInsets(top: -30, left: -30, bottom: -30, right: -30)
+            preferredContentSize = UIEdgeInsetsInsetRect(customView.bounds, insets).size
+        } else {
+            preferredContentSize = CGSizeMake(100.0, 100.0)
+        }
 
         modalPresentationStyle = .Custom
         transitioningDelegate = self