[FIX] fixing incremental cell state updates

Author: Michael Ehrmann

Source/PSMTabBarControl.m

@@ -2003,7 +2003,6 @@ - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabV
 			[self update];
 		} else {
 			[_controller setSelectedCell:thisCell];
-			[self update];
 		}
 	}
 

Source/PSMTabBarController.m

@@ -92,18 +92,18 @@ - (void)setSelectedCell:(PSMTabBarCell *)cell {
 	}
 
 	[nextCell setState:NSOffState];
-	[nextCell setTabState:PSMTab_PositionMiddleMask];
+	[nextCell setTabState:[nextCell tabState] & ~(PSMTab_SelectedMask)];
 
 	if(lastCell && lastCell != [_control lastVisibleTab]) {
-		[lastCell setTabState:~[lastCell tabState] & PSMTab_RightIsSelectedMask];
+		[lastCell setTabState:[lastCell tabState] & (~PSMTab_RightIsSelectedMask)];
 	}
 
 	if((nextCell = [enumerator nextObject])) {
-		[nextCell setTabState:~[lastCell tabState] & PSMTab_LeftIsSelectedMask];
+		[nextCell setTabState:[nextCell tabState] & (~PSMTab_LeftIsSelectedMask)];
 	}
 
 	[cell setState:NSOnState];
-	[cell setTabState:PSMTab_SelectedMask];
+	[cell setTabState:[cell tabState] | PSMTab_SelectedMask];
 
 	if(![cell isInOverflowMenu]) {
 		NSUInteger cellIndex = [cells indexOfObject:cell];

Source/PSMTabDragAssistant.m

@@ -778,7 +778,7 @@ - (void)distributePlaceholdersInTabBarControl:(PSMTabBarControl *)tabBarControl
 	// called upon first drag - must distribute placeholders
 	[self distributePlaceholdersInTabBarControl:tabBarControl];
 
-	NSArray *cells = [tabBarControl cells];
+	NSArray *cells = [[tabBarControl cells] copy];
 
 	// replace dragged cell with a placeholder, and clean up surrounding cells
 	NSUInteger cellIndex = [cells indexOfObject:cell];
@@ -789,9 +789,14 @@ - (void)distributePlaceholdersInTabBarControl:(PSMTabBarControl *)tabBarControl
 		[tabBarControl removeCellAtIndex:(cellIndex + 1)];
 		[tabBarControl removeCellAtIndex:(cellIndex - 1)];
 
+		// if cell was selected cell, update selection direction markers of surrounding cells
 		if((NSInteger)cellIndex - 2 >= 0) {
 			pc = [cells objectAtIndex:cellIndex - 2];
-			[pc setTabState:~[pc tabState] & PSMTab_RightIsSelectedMask];
+			[pc setTabState:[pc tabState] & (~PSMTab_RightIsSelectedMask)];
+		}
+		if((NSInteger)cellIndex + 2 < cells.count) {
+			pc = [cells objectAtIndex:cellIndex + 2];
+			[pc setTabState:[pc tabState] & (~PSMTab_LeftIsSelectedMask)];
 		}
 	}
 }