Merge pull request #80 from greenius/xcode12

Fix problem of assigned controlView being optimised away in XCode 12 …

Author: MiMo42

MMTabBarView/MMTabBarView.xcodeproj/project.pbxproj

@@ -839,6 +839,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 06DB239A1609F5820071BDA0;

MMTabBarView/MMTabBarView/MMAttachedTabBarButtonCell.h

@@ -18,13 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  *  The control view
- * 
- *  TODO: fix, rename "attachedTabBarButton"
  */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wincompatible-property-type"
-@property (assign) MMAttachedTabBarButton *controlView;
-#pragma clang diagnostic pop
+@property (nullable, weak) MMAttachedTabBarButton *attachedTabBarButton;
 
 @end
 

MMTabBarView/MMTabBarView/MMAttachedTabBarButtonCell.m

@@ -24,12 +24,15 @@ - (instancetype)init {
 #pragma mark -
 #pragma mark Properties
 
-- (MMAttachedTabBarButton *)controlView {
-    return (MMAttachedTabBarButton *)[super controlView];
+- (nullable MMAttachedTabBarButton *)controlView {
+    // return (MMAttachedTabBarButton *)[super controlView];
+  return _attachedTabBarButton;
 }
 
-- (void)setControlView:(MMAttachedTabBarButton *)aView {
-    [super setControlView:aView];
+- (void) setControlView:(nullable NSView *)aView
+{
+  [super setControlView:aView];
+  _attachedTabBarButton = (MMAttachedTabBarButton*)aView;
 }
 
 #pragma mark -

MMTabBarView/MMTabBarView/MMTabBarButtonCell.h

@@ -36,18 +36,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  *  The control view
- * 
- *  TODO: fix, rename "tabBarButton"
  */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wincompatible-property-type"
-@property (assign) MMTabBarButton *controlView;
-#pragma clang diagnostic pop
+@property (nullable, weak) MMTabBarButton *tabBarButton;
 
 /**
  *  Tab bar view the tab bar button belongs to
  */
-@property (readonly) MMTabBarView *tabBarView;
+@property (nullable, readonly) MMTabBarView *tabBarView;
 
 #pragma mark Update images
 
@@ -118,14 +113,14 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Get progress indicator
  */
-@property (readonly) MMProgressIndicator *indicator;
+@property (nullable, readonly) MMProgressIndicator *indicator;
 
 #pragma mark Close Button Support
 
 /**
  *  The close button
  */
-@property (readonly) MMRolloverButton *closeButton;
+@property (nullable, readonly) MMRolloverButton *closeButton;
 
 /**
  *  Check if receiver should display close button

MMTabBarView/MMTabBarView/MMTabBarButtonCell.m

@@ -53,16 +53,18 @@ - (instancetype)init {
 	return self;
 }
 
-- (MMTabBarButton *)controlView {
-    return (MMTabBarButton *)[super controlView];
+- (nullable MMTabBarButton *)controlView {
+    // return (MMTabBarButton *)[super controlView];
+  return _tabBarButton;
 }
 
-- (void)setControlView:(MMTabBarButton *)aView {
-    [super setControlView:aView];
+- (void)setControlView:(nullable NSView *)aView {
+  _tabBarButton = (MMTabBarButton*) aView;
+  [super setControlView:aView];
 }
 
-- (MMTabBarView *)tabBarView {
-    return self.controlView.tabBarView;
+- (nullable MMTabBarView *)tabBarView {
+    return _tabBarButton.tabBarView;
 }
 
 - (void)calcDrawInfo:(NSRect)aRect {
@@ -183,15 +185,15 @@ - (void)setState:(NSInteger)value {
 #pragma mark -
 #pragma mark Progress Indicator Support
 
-- (MMProgressIndicator *)indicator {
-    return self.controlView.indicator;
+- (nullable MMProgressIndicator *)indicator {
+    return self.tabBarButton.indicator;
 }
 
 #pragma mark -
 #pragma mark Close Button Support
 
-- (MMRolloverButton *)closeButton {
-    return self.controlView.closeButton;
+- (nullable MMRolloverButton *)closeButton {
+    return self.tabBarButton.closeButton;
 }
 
 - (NSImage *)closeButtonImageOfType:(MMCloseButtonImageType)type {
@@ -599,7 +601,7 @@ - (NSImage *)_closeButtonImageOfType:(MMCloseButtonImageType)type {
 - (void)_updateCloseButton {
 
     MMTabBarView *tabBarView = self.tabBarView;
-    MMTabBarButton *button = self.controlView;
+    MMTabBarButton *button = self.tabBarButton;
     MMRolloverButton *closeButton = button.closeButton;
 
     [self _updateCloseButtonImages];
@@ -630,7 +632,7 @@ - (void)_updateCloseButton {
 - (void)_updateIndicator {
 
     MMTabBarView *tabBarView = self.tabBarView;
-    MMTabBarButton *button = self.controlView;
+    MMTabBarButton *button = self.tabBarButton;
     MMProgressIndicator *indicator = button.indicator;
 
         // adjust visibility and position of process indicator

MMTabBarView/MMTabBarView/Styles/Mojave Tab Style/MMMojaveTabStyle.m

@@ -161,7 +161,7 @@ - (NSAttributedString *)attributedStringValueForTabCell:(MMTabBarButtonCell *)ce
 
 	 // Figure out correct text color
 
-    if ( cell.controlView.state == NSOnState )
+    if ( cell.tabBarButton.state == NSOnState )
     {
         textColor = [self colorForPart:MMMtabSelectedFont ofTabBarView:cell.tabBarView];
     }