Merge pull request #41 from balthisar/revert_to_instrinsic

NSViewNoIntrinsicMetric fix for pre 10.11.
MiMo42 · Jun 21, 2016 · afea971 · afea971
2 parents 38ff7cd + d89f837
commit afea971
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/MMTabBarView Demo/MMTabBarView Demo/DemoWindowController.m b/MMTabBarView Demo/MMTabBarView Demo/DemoWindowController.m
@@ -214,7 +214,7 @@ -(void)_updateForOrientation:(MMTabBarOrientation)newOrientation {
     NSSize intrinsicTabBarContentSize = [tabBar intrinsicContentSize];
 
 	if (newOrientation == MMTabBarHorizontalOrientation) {
-        if (intrinsicTabBarContentSize.height == NSViewNoIntrinsicMetric)
+        if (intrinsicTabBarContentSize.height == NSViewNoInstrinsicMetric)
             intrinsicTabBarContentSize.height = 22;
 		tabBarFrame.size.height = [tabBar isTabBarHidden] ? 1 : intrinsicTabBarContentSize.height;
 		tabBarFrame.size.width = totalFrame.size.width;

diff --git a/MMTabBarView/MMTabBarView/MMTabBarView.m b/MMTabBarView/MMTabBarView/MMTabBarView.m
@@ -232,7 +232,7 @@ - (NSSize)intrinsicContentSize
     if ([_style respondsToSelector:@selector(intrinsicContentSizeOfTabBarView:)])
         return [_style intrinsicContentSizeOfTabBarView:self];
 
-    return NSMakeSize(NSViewNoIntrinsicMetric, NSViewNoIntrinsicMetric);
+    return NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric);
 }
 
 #pragma mark -

diff --git a/MMTabBarView/MMTabBarView/Styles/Yosemite Tab Style/MMYosemiteTabStyle.m b/MMTabBarView/MMTabBarView/Styles/Yosemite Tab Style/MMYosemiteTabStyle.m
@@ -48,7 +48,7 @@ - (id) init {
 
 - (NSSize)intrinsicContentSizeOfTabBarView:(MMTabBarView *)tabBarView
 {
-    return NSMakeSize(NSViewNoIntrinsicMetric, 25);
+    return NSMakeSize(NSViewNoInstrinsicMetric, 25);
 }
 
 - (CGFloat)leftMarginForTabBarView:(MMTabBarView *)tabBarView {