Skip to content

Commit

Permalink
Vertically centered labels in the theme outline view, fixed some auto…
Browse files Browse the repository at this point in the history 
…layout ambiguites
  • Loading branch information
@mikekazakov
mikekazakov committed Jun 16, 2024
1 parent 63404b9 commit 77435f3
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 40 deletions.
18 changes: 9 additions & 9 deletions Source/NimbleCommander/NimbleCommander/Preferences/Base.lproj/PreferencesWindowThemesTab.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -50,7 +50,7 @@
<rect key="frame" x="1" y="1" width="289" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mUc-me-ky1">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mUc-me-ky1">
<rect key="frame" x="0.0" y="1" width="289" height="16"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="eX8-RA-KwN">
Expand Down Expand Up @@ -120,13 +120,13 @@
</scrollView>
<button horizontalHuggingPriority="1000" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P1x-SI-ICv">
<rect key="frame" x="102" y="19" width="62" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="hum-M2-Ckn"/>
</constraints>
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="P9u-4v-kME">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="21" id="hum-M2-Ckn"/>
</constraints>
</button>
<segmentedControl horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YHF-J9-jbm">
<rect key="frame" x="20" y="19" width="83" height="23"/>
Expand Down Expand Up @@ -198,8 +198,8 @@
</menu>
</objects>
<resources>
<image name="NSActionTemplate" width="15" height="15"/>
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSRemoveTemplate" width="14" height="4"/>
<image name="NSActionTemplate" width="20" height="20"/>
<image name="NSAddTemplate" width="18" height="17"/>
<image name="NSRemoveTemplate" width="18" height="5"/>
</resources>
</document>
38 changes: 19 additions & 19 deletions ...NimbleCommander/Preferences/Base.lproj/PreferencesWindowThemesTabColoringRulesControl.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -20,13 +20,13 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<scrollView autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RNZ-Qr-pWu">
<rect key="frame" x="0.0" y="22" width="480" height="248"/>
<rect key="frame" x="0.0" y="21" width="480" height="249"/>
<clipView key="contentView" id="OsV-YV-G77">
<rect key="frame" x="1" y="1" width="478" height="246"/>
<rect key="frame" x="1" y="1" width="478" height="247"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" headerView="UeM-ZM-O4W" viewBased="YES" id="gEi-az-coH">
<rect key="frame" x="0.0" y="0.0" width="478" height="223"/>
<rect key="frame" x="0.0" y="0.0" width="478" height="224"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -48,7 +48,7 @@
<rect key="frame" x="1" y="1" width="105" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w82-gp-o7c">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w82-gp-o7c">
<rect key="frame" x="0.0" y="0.0" width="105" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="tCj-0u-HiC">
Expand Down Expand Up @@ -80,7 +80,7 @@
<rect key="frame" x="109" y="1" width="60" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5CV-wH-7eP">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5CV-wH-7eP">
<rect key="frame" x="0.0" y="0.0" width="60" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="NhI-RM-YuG">
Expand Down Expand Up @@ -112,7 +112,7 @@
<rect key="frame" x="172" y="1" width="60" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VmU-e8-X2l">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VmU-e8-X2l">
<rect key="frame" x="0.0" y="0.0" width="60" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="Fl6-nd-iFu">
Expand Down Expand Up @@ -144,7 +144,7 @@
<rect key="frame" x="235" y="1" width="74" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wRf-To-RYl">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wRf-To-RYl">
<rect key="frame" x="0.0" y="0.0" width="74" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="cGg-68-vf8">
Expand Down Expand Up @@ -182,7 +182,7 @@
</tableHeaderView>
</scrollView>
<segmentedControl horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CV9-ra-BaN">
<rect key="frame" x="0.0" y="1" width="49" height="23"/>
<rect key="frame" x="0.0" y="-1" width="49" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="49" id="M39-4x-Dud"/>
</constraints>
Expand All @@ -198,23 +198,23 @@
</connections>
</segmentedControl>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dBF-9n-N5r">
<rect key="frame" x="48" y="1" width="432" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="Wdk-hz-cM6"/>
</constraints>
<rect key="frame" x="48" y="-1" width="432" height="23"/>
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6sn-pf-m7y">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="21" id="Wdk-hz-cM6"/>
</constraints>
</button>
</subviews>
<constraints>
<constraint firstItem="RNZ-Qr-pWu" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="2" id="28f-Tl-Xwu"/>
<constraint firstAttribute="bottom" secondItem="CV9-ra-BaN" secondAttribute="bottom" constant="2" id="8Kc-MR-gUB"/>
<constraint firstAttribute="bottom" secondItem="CV9-ra-BaN" secondAttribute="bottom" id="8Kc-MR-gUB"/>
<constraint firstAttribute="trailing" secondItem="dBF-9n-N5r" secondAttribute="trailing" id="CLE-2r-SlO"/>
<constraint firstAttribute="bottom" secondItem="dBF-9n-N5r" secondAttribute="bottom" constant="2" id="Uwf-JV-dne"/>
<constraint firstAttribute="bottom" secondItem="dBF-9n-N5r" secondAttribute="bottom" id="Uwf-JV-dne"/>
<constraint firstItem="CV9-ra-BaN" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="bfW-ji-VcR"/>
<constraint firstItem="dBF-9n-N5r" firstAttribute="top" secondItem="RNZ-Qr-pWu" secondAttribute="bottom" constant="-1" id="f2y-HI-oUt"/>
<constraint firstItem="dBF-9n-N5r" firstAttribute="top" secondItem="RNZ-Qr-pWu" secondAttribute="bottom" id="f2y-HI-oUt"/>
<constraint firstItem="RNZ-Qr-pWu" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="mUj-7D-xdD"/>
<constraint firstItem="dBF-9n-N5r" firstAttribute="leading" secondItem="CV9-ra-BaN" secondAttribute="trailing" constant="-1" id="qVA-R7-RS5"/>
<constraint firstAttribute="trailing" secondItem="RNZ-Qr-pWu" secondAttribute="trailing" id="wva-bd-Xca"/>
Expand All @@ -223,7 +223,7 @@
</customView>
</objects>
<resources>
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSRemoveTemplate" width="14" height="4"/>
<image name="NSAddTemplate" width="18" height="17"/>
<image name="NSRemoveTemplate" width="18" height="5"/>
</resources>
</document>
Loading

0 comments on commit 77435f3

Please sign in to comment.