Skip to content
Snippets Groups Projects
Commit c5a4d215 authored by Darius Vallejo's avatar Darius Vallejo Committed by George Nachman
Browse files

Refactor touch bar code, removing duplicate code and moving some large code into its own method.

parent 55ee470d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sources/PseudoTerminal+TouchBar.m
+ 49
− 80
View file @ c5a4d215
@@ -174,54 +174,63 @@ ITERM_IGNORE_PARTIAL_BEGIN
[button sizeToFit];
[documentView addSubview:button];
button.translatesAutoresizingMaskIntoConstraints = NO;
if (previous == nil) {
// Constrain the first item's left to the document view's left
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeLeft
multiplier:1
constant:0]];
} else {
// Constrain non-first button's left to predecessor's right + 8pt
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:previous
attribute:NSLayoutAttributeRight
multiplier:1
constant:8]];
}
// Constrain top and bottom to document view's top and bottom
[self addConstraintsToButton:button superView:documentView previous:previous];
previous = button;
}
if (previous) {
// Constrain last button's right to document view's right
[self constrainButton:previous toRightOfSuperview:documentView];
}
item.customizationLabel = @"Function Keys";
return item;
}
- (void)addConstraintsToButton:(iTermTouchBarButton *)button superView:(NSView *)documentView previous:(NSButton *)previous {
if (previous == nil) {
// Constrain the first item's left to the document view's left
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeTop
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeTop
attribute:NSLayoutAttributeLeft
multiplier:1
constant:0]];
} else {
// Constrain non-first button's left to predecessor's right + 8pt
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeBottom
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeBottom
multiplier:1
constant:0]];
previous = button;
}
if (previous) {
// Constrain last button's right to document view's right
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:previous
attribute:NSLayoutAttributeRight
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:documentView
toItem:previous
attribute:NSLayoutAttributeRight
multiplier:1
constant:0]];
constant:8]];
}
item.customizationLabel = @"Function Keys";
return item;
// Constrain top and bottom to document view's top and bottom
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeTop
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeTop
multiplier:1
constant:0]];
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeBottom
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeBottom
multiplier:1
constant:0]];
}
- (void)constrainButton:(NSButton *)previous toRightOfSuperview:(NSView *)documentView {
// Constrain button's right to document view's right
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:previous
attribute:NSLayoutAttributeRight
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeRight
multiplier:1
constant:0]];
}
 
- (NSTouchBarItem *)colorPresetsScrollViewTouchBarItem {
@@ -258,52 +267,12 @@ ITERM_IGNORE_PARTIAL_BEGIN
button.keyBindingAction = @{ @"presetName": name };
[documentView addSubview:button];
button.translatesAutoresizingMaskIntoConstraints = NO;
if (previous == nil) {
// Constrain the first item's left to the document view's left
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeLeft
multiplier:1
constant:0]];
} else {
// Constrain non-first button's left to predecessor's right + 8pt
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:previous
attribute:NSLayoutAttributeRight
multiplier:1
constant:8]];
}
// Constrain top and bottom to document view's top and bottom
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeTop
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeTop
multiplier:1
constant:0]];
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:button
attribute:NSLayoutAttributeBottom
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeBottom
multiplier:1
constant:0]];
[self addConstraintsToButton:button superView:documentView previous:previous];;
previous = button;
}
}
if (previous) {
// Constrain last button's right to document view's right
[documentView addConstraint:[NSLayoutConstraint constraintWithItem:previous
attribute:NSLayoutAttributeRight
relatedBy:NSLayoutRelationEqual
toItem:documentView
attribute:NSLayoutAttributeRight
multiplier:1
constant:0]];
[self constrainButton:previous toRightOfSuperview:documentView];
}
return item;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment