Fix rebase for swift3

tbaranes · Aug 11, 2016 · ddb1f21 · ddb1f21
1 parent 48d077a
commit ddb1f21
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/AdaptiveSpaceItem Example/macOS Example/Base.lproj/MainMenu.xib b/AdaptiveSpaceItem Example/macOS Example/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11191" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11191"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

diff --git a/Sources/AdaptiveSpaceItem.swift b/Sources/AdaptiveSpaceItem.swift
@@ -47,10 +47,10 @@ public class AdaptiveSpaceItem: NSToolbarItem {
 
     private func minSize() -> NSSize {
         let items = toolbar?.items
-        let index = items?.indexOf(self)
+        let index = items?.index(of: self)
         guard let unwrappedIndex = index,
-            unwrappedItems = items,
-            superviewFrame = view?.superview?.frame where superviewFrame.origin.x > 0 else {
+            let unwrappedItems = items,
+            let superviewFrame = view?.superview?.frame, superviewFrame.origin.x > 0 else {
                 return minSize
         }
 
@@ -84,12 +84,17 @@ class AdaptiveSpaceItemView: NSView {
 
     // MARK: - Life cycle
 
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        adaptiveSpaceItem?.updateWidth()
+    }
+
     override func viewDidMoveToWindow() {
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(windowDidResize), name: NSWindowDidResizeNotification, object: self.window)
+        NotificationCenter.default.addObserver(self, selector: #selector(windowDidResize), name: NSNotification.Name.NSWindowDidResize, object: self.window)
     }
 
     deinit {
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
 
     // MARK: - Notifications