Merge branch 'master' into feature/customizable-session-messages

Author: kud

ThirdParty/PSMTabBarControl/source/PSMTabBarControl.m

@@ -969,6 +969,7 @@ - (void)setPartnerView:(id)view
 
 - (void)backgroundColorWillChange {
     _overflowPopUpButton.appearance = _style.accessoryAppearance;
+    _addTabButton.appearance = _style.accessoryAppearance;
 }
 
 #pragma mark -

sources/ProfileListView.m

@@ -1131,7 +1131,7 @@ - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
                                        frame.size.height - kSearchWidgetHeight - margin_);
     splitView_.frame = splitViewFrame;
 
-    if (tableView_.delegate) {
+    if (tableView_.delegate && frame.size.width != oldBoundsSize.width) {
         NSMutableIndexSet *rowsWithHeightChange = [NSMutableIndexSet indexSet];
         for (NSInteger i = 0; i < self.numberOfRows; i++) {
             CGFloat savedHeight = [_savedHeights[@(i)] doubleValue];

sources/SplitSelectionView.m

@@ -132,8 +132,23 @@ - (void)drawRect:(NSRect)dirtyRect {
 }
 
 - (void)drawSourceWithMessage:(NSString *)message rect:(NSRect)dirtyRect {
-    [[NSColor colorWithCalibratedRed:0 green:0.5 blue:0 alpha:1] set];
+    NSString *hexColor = [iTermAdvancedSettingsModel splitPaneSourceFillColor];
+    NSColor *color = [NSColor colorFromHexString:hexColor];
+    [color ?: [NSColor colorWithCalibratedRed:0 green:0.5 blue:0 alpha:1] set];
     NSRectFill(dirtyRect);
+    
+    NSRect highlightRect = self.frame;
+    hexColor = [iTermAdvancedSettingsModel splitPaneSourceBorderColor];
+    color = [NSColor colorFromHexString:hexColor];
+    [color ?: [NSColor whiteColor] set];
+    NSFrameRect(highlightRect);
+    
+    highlightRect = NSInsetRect(highlightRect, 1, 1);
+    hexColor = [iTermAdvancedSettingsModel splitPaneSourceInnerBorderColor];
+    color = [NSColor colorFromHexString:hexColor];
+    [color ?: [NSColor blackColor] set];
+    NSFrameRect(highlightRect);
+    
     [self _showMessage:message inRect:self.frame];
 }
 

sources/iTermAdvancedSettingsModel.h

@@ -414,6 +414,9 @@ extern NSString *const iTermAdvancedSettingsDidChange;
 + (int)smartSelectionRadius;
 + (BOOL)solidUnderlines;
 + (NSString *)splitPaneColor;
++ (NSString *)splitPaneSourceFillColor;
++ (NSString *)splitPaneSourceBorderColor;
++ (NSString *)splitPaneSourceInnerBorderColor;
 + (NSString *)splitPaneTargetDropFillColor;
 + (NSString *)splitPaneTargetDropBorderColor;
 + (NSString *)splitPaneTargetDropInnerBorderColor;

sources/iTermAdvancedSettingsModel.m

@@ -319,6 +319,9 @@ + (BOOL)settingIsDeprecated:(NSString *)name {
 DEFINE_BOOL(defaultIconsUsingLetters, YES, SECTION_TABS @"Use the running command's first letter as the tab's default icon if there isn't a built in one.\nThis takes effect when tabs are configured to use built-in icons.");
 DEFINE_BOOL(tabCloseButtonsAlwaysVisible, NO, SECTION_TABS @"Should tab close buttons always remain visible?");
 DEFINE_BOOL(useSequoiaStyleTabs, NO, SECTION_TABS @"Use Sequoia-style tabs in Tahoe and later?");
+DEFINE_STRING(splitPaneSourceFillColor, @"#008000", SECTION_TABS @"Color of source pane fill when moving/swapping a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")
+DEFINE_STRING(splitPaneSourceBorderColor, @"#ffffff", SECTION_TABS @"Color of source pane outer border when moving/swapping a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")
+DEFINE_STRING(splitPaneSourceInnerBorderColor, @"#000000", SECTION_TABS @"Color of source pane inner border when moving/swapping a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")
 DEFINE_STRING(splitPaneTargetDropFillColor, @"#800000", SECTION_TABS @"Color of drop target fill when dragging a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")
 DEFINE_STRING(splitPaneTargetDropBorderColor, @"#ffffff", SECTION_TABS @"Color of drop target outer border when dragging a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")
 DEFINE_STRING(splitPaneTargetDropInnerBorderColor, @"#000000", SECTION_TABS @"Color of drop target inner border when dragging a split pane.\nShould be a web-style color, #rrggbb. You can also use p3#rrggbb for p3 color space.")