Merge remote-tracking branch 'upstream/master'

cockscomb · Mar 17, 2016 · 0ef25d0 · 0ef25d0
2 parents a7d42fe + 698fbaa
commit 0ef25d0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/HUDKit/Classes/Progress/HUDProgressViewController.swift b/HUDKit/Classes/Progress/HUDProgressViewController.swift
@@ -75,7 +75,12 @@ public class HUDProgressViewController: UIViewController {
         self.customView = customView
         self.status = status
 
-        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