Skip to content
Snippets Groups Projects
Commit 703824a9 authored by George Nachman's avatar George Nachman
Browse files

Add divider between table and text field

parent 291a49cc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
iTerm.xcodeproj/project.pbxproj
+ 6
− 0
View file @ 703824a9
@@ -835,6 +835,8 @@
A69B4587196F8EA100F5444D /* iTermOpenQuicklyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A69B4583196F8EA100F5444D /* iTermOpenQuicklyWindowController.m */; };
A69B4588196F8EA100F5444D /* iTermOpenQuicklyWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A69B4584196F8EA100F5444D /* iTermOpenQuicklyWindowController.xib */; };
A69B4589196F8EA100F5444D /* iTermOpenQuicklyWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A69B4584196F8EA100F5444D /* iTermOpenQuicklyWindowController.xib */; };
A69B458B19710CC400F5444D /* SoftDivider.png in Resources */ = {isa = PBXBuildFile; fileRef = A69B458A19710CC400F5444D /* SoftDivider.png */; };
A69B458C19710CC400F5444D /* SoftDivider.png in Resources */ = {isa = PBXBuildFile; fileRef = A69B458A19710CC400F5444D /* SoftDivider.png */; };
A6A13AA218C2D23300B241ED /* iTermColorMap.h in Headers */ = {isa = PBXBuildFile; fileRef = A6A13AA018C2D23300B241ED /* iTermColorMap.h */; };
A6A13AA318C2D23300B241ED /* iTermColorMap.m in Sources */ = {isa = PBXBuildFile; fileRef = A6A13AA118C2D23300B241ED /* iTermColorMap.m */; };
A6A13AA418C2D23300B241ED /* iTermColorMap.m in Sources */ = {isa = PBXBuildFile; fileRef = A6A13AA118C2D23300B241ED /* iTermColorMap.m */; };
@@ -1548,6 +1550,7 @@
A69B4582196F8EA100F5444D /* iTermOpenQuicklyWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermOpenQuicklyWindowController.h; sourceTree = "<group>"; };
A69B4583196F8EA100F5444D /* iTermOpenQuicklyWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = iTermOpenQuicklyWindowController.m; sourceTree = "<group>"; tabWidth = 4; };
A69B4584196F8EA100F5444D /* iTermOpenQuicklyWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = iTermOpenQuicklyWindowController.xib; sourceTree = "<group>"; };
A69B458A19710CC400F5444D /* SoftDivider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SoftDivider.png; path = images/SoftDivider.png; sourceTree = "<group>"; };
A6A13AA018C2D23300B241ED /* iTermColorMap.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = iTermColorMap.h; sourceTree = "<group>"; tabWidth = 4; };
A6A13AA118C2D23300B241ED /* iTermColorMap.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = iTermColorMap.m; sourceTree = "<group>"; tabWidth = 4; };
A6A13AA518C2D45900B241ED /* NSColor+iTerm.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = "NSColor+iTerm.h"; sourceTree = "<group>"; tabWidth = 4; };
@@ -2183,6 +2186,7 @@
1D093C131217412B0029F9AD /* Images */ = {
isa = PBXGroup;
children = (
A69B458A19710CC400F5444D /* SoftDivider.png */,
1DA3E2AB1970AC4000001E6E /* LogoParts */,
A69B457A1967B03B00F5444D /* BrokenPipeDivider.png */,
1DC2AF4F19521CFF005769D5 /* QuestionMarkSign.png */,
@@ -3244,6 +3248,7 @@
1DC2A1CF1949165D005769D5 /* Maximized@2x.png in Resources */,
1DB8FBCD19468A40006BAF5C /* AquaTabsSeparator_vertical.png in Resources */,
1DC13AC81886507D00034DAE /* CommandHistoryPopup.xib in Resources */,
A69B458C19710CC400F5444D /* SoftDivider.png in Resources */,
1DC2A1CD1949165D005769D5 /* Maximized.png in Resources */,
A67F118118D82B9500B23C7B /* PrefsAdvanced.png in Resources */,
1DA3E2B51970AC5900001E6E /* Tabs.png in Resources */,
@@ -3347,6 +3352,7 @@
1DC13ABF1886146B00034DAE /* mark_err@2x.png in Resources */,
1DA02CFB1327612600D7E7DB /* bell.png in Resources */,
A6E7139F18F7B199008D94DD /* BulkCopyProfilePreferences.xib in Resources */,
A69B458B19710CC400F5444D /* SoftDivider.png in Resources */,
1DA030F91328BD7C00D7E7DB /* wrap_to_bottom.png in Resources */,
1DA030FA1328BD7C00D7E7DB /* wrap_to_top.png in Resources */,
1D1158CE13444D29009B366F /* iTerm2 Help in Resources */,
iTermOpenQuicklyWindowController.m
+ 16
− 13
View file @ 703824a9
@@ -231,6 +231,16 @@ static const double kUserDefinedVariableMultiplier = 1;
- (void)awakeFromNib {
[_table setDoubleAction:@selector(doubleClick:)];
[self.window setOpaque:NO];
SolidColorView *contentView = [self.window contentView];
contentView.color = [NSColor controlColor];
_table.backgroundColor = [NSColor controlColor];
contentView.wantsLayer = YES;
contentView.layer.cornerRadius = 6;
contentView.layer.masksToBounds = YES;
contentView.layer.borderColor = [[NSColor colorWithCalibratedRed:0.75 green:0.75 blue:0.75 alpha:1] CGColor];
contentView.layer.borderWidth = 1;
self.window.backgroundColor = [NSColor clearColor];
}
 
- (void)dealloc {
@@ -527,14 +537,7 @@ static const double kUserDefinedVariableMultiplier = 1;
NSSize contentSize = frame.size;
contentSize.height = nonTableSpace + (_table.rowHeight + _table.intercellSpacing.height) * numberOfVisibleRowsDesired;
 
if (numberOfVisibleRowsDesired) {
frame.size.height = [NSScrollView frameSizeForContentSize:contentSize
hasHorizontalScroller:NO
hasVerticalScroller:YES
borderType:NSBezelBorder].height;
} else {
frame.size.height = contentSize.height;
}
frame.size.height = contentSize.height;
 
frame.origin.x = floor((screen.frame.size.width - frame.size.width) / 2);
frame.origin.y = screen.frame.origin.y + screen.frame.size.height - kMarginAboveWindow - frame.size.height;
@@ -590,7 +593,7 @@ static const double kUserDefinedVariableMultiplier = 1;
if (row == tableView.selectedRow) {
color = [NSColor whiteColor];
} else {
color = [NSColor blackColor];
color = [NSColor colorWithCalibratedWhite:0.01 alpha:1];
}
result.textField.textColor = color;
result.detailTextField.textColor = color;
@@ -605,8 +608,8 @@ static const double kUserDefinedVariableMultiplier = 1;
NSInteger row = [_table selectedRow];
if (row >= 0) {
iTermOpenQuicklyItem *item = _items[row];
item.view.textField.textColor = [NSColor blackColor];
item.view.detailTextField.textColor = [NSColor blackColor];
item.view.textField.textColor = [NSColor colorWithCalibratedWhite:0.01 alpha:1];
item.view.detailTextField.textColor = [NSColor colorWithCalibratedWhite:0.01 alpha:1];
}
}
 
@@ -618,8 +621,8 @@ static const double kUserDefinedVariableMultiplier = 1;
item.view.textField.textColor = [NSColor whiteColor];
item.view.detailTextField.textColor = [NSColor whiteColor];
} else {
item.view.textField.textColor = [NSColor blackColor];
item.view.detailTextField.textColor = [NSColor blackColor];
item.view.textField.textColor = [NSColor colorWithCalibratedWhite:0.01 alpha:1];
item.view.detailTextField.textColor = [NSColor colorWithCalibratedWhite:0.01 alpha:1];
}
}
}
iTermOpenQuicklyWindowController.xib
+ 15
− 9
View file @ 703824a9
@@ -18,7 +18,7 @@
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="449" height="453"/>
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
<view key="contentView" id="se5-gp-TjO" customClass="iTermOpenQuicklyRoundedCornersView">
<view key="contentView" id="se5-gp-TjO" customClass="SolidColorView">
<rect key="frame" x="0.0" y="0.0" width="449" height="453"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
@@ -35,21 +35,21 @@
<outlet property="delegate" destination="-2" id="fs4-q0-45g"/>
</connections>
</textField>
<scrollView autohidesScrollers="YES" horizontalLineScroll="49" horizontalPageScroll="10" verticalLineScroll="49" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="dC8-0m-hjk">
<rect key="frame" x="0.0" y="-1" width="449" height="412"/>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="49" horizontalPageScroll="10" verticalLineScroll="49" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="dC8-0m-hjk">
<rect key="frame" x="0.0" y="-1" width="449" height="411.99999880906449"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
<clipView key="contentView" id="Ung-Ej-hla">
<rect key="frame" x="1" y="1" width="447" height="410"/>
<rect key="frame" x="0.0" y="-1.1909355634998064e-06" width="449" height="412"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="47" rowSizeStyle="automatic" viewBased="YES" id="zk3-s6-bJy" customClass="iTermOpenQuicklyTableView">
<rect key="frame" x="0.0" y="0.0" width="447" height="410"/>
<rect key="frame" x="0.0" y="0.0" width="449" height="412"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="0.0" height="2"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="447" minWidth="40" maxWidth="1000" id="b2X-R7-hTf">
<tableColumn width="449" minWidth="40" maxWidth="1000" id="b2X-R7-hTf">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -63,7 +63,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="0QS-i7-vPb" userLabel="iTermOpenQuicklyTableCellView" customClass="iTermOpenQuicklyTableCellView">
<rect key="frame" x="0.0" y="1" width="447" height="47"/>
<rect key="frame" x="0.0" y="1" width="449" height="47"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Oib-KS-k2o">
@@ -72,10 +72,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="iTerm" id="i5c-dK-g2L"/>
</imageView>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="k08-aT-fZl" userLabel="Text Field - Title">
<rect key="frame" x="53" y="20" width="394" height="27"/>
<rect key="frame" x="53" y="18" width="396" height="25"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="LTe-QL-Nlc">
<font key="font" metaFont="system" size="22"/>
<font key="font" metaFont="system" size="21"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -130,6 +130,11 @@ Gw
<action selector="close:" target="-2" id="mVi-R5-hgI"/>
</connections>
</button>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="aFe-eF-HcT">
<rect key="frame" x="0.0" y="404" width="449" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="SoftDivider" id="WpI-1v-4lf"/>
</imageView>
</subviews>
</view>
<connections>
@@ -139,6 +144,7 @@ Gw
</window>
</objects>
<resources>
<image name="SoftDivider" width="449" height="4"/>
<image name="closebutton" width="13" height="14"/>
<image name="iTerm" width="512" height="512"/>
</resources>
images/SoftDivider.png 0 → 100644
+ 0
− 0
View file @ 703824a9
images/SoftDivider.png

1.08 KiB

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