mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-09-11 11:25:57 +03:00
Fix autolayout of syntax editor sheet
This commit is contained in:
1024jp
parent
aa107f73d1
commit
d9359cf08a
@ -14,6 +14,7 @@ develop
|
||||
### Fixes
|
||||
|
||||
- Fix a possible crash on changing document's encoding lossy.
|
||||
- Fix an issue where application crashed if syntax editor panel becomes too small.
|
||||
- Fix an issue where editor views didn't update after changing the body font or the visibility of the other invisible characters.
|
||||
- Fix an issue where no error message raised when an text encoding reinterpretation failed.
|
||||
- Fix an issue where the current line highlight also highligts the last line when the cursor is in the second last line.
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
|
||||
<capability name="box content view" minToolsVersion="7.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="SyntaxEditViewController" customModule="CotEditor" customModuleProvider="target">
|
||||
@ -52,7 +53,7 @@
|
||||
<binding destination="-2" name="hidden" keyPath="styleNameValid" id="jgz-kY-X66"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<textField horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-TL-DXQ" customClass="WrappingTextField" customModule="CotEditor" customModuleProvider="target">
|
||||
<textField horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-TL-DXQ" customClass="WrappingTextField" customModule="CotEditor" customModuleProvider="target">
|
||||
<rect key="frame" x="166" y="390" width="466" height="14"/>
|
||||
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="message" id="d7M-En-Qx0">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
@ -142,6 +143,9 @@
|
||||
<rect key="frame" x="1" y="1" width="466" height="333"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
</view>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="200" id="LkO-is-VDq"/>
|
||||
</constraints>
|
||||
</box>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8JS-kM-ddu">
|
||||
<rect key="frame" x="14" y="13" width="152" height="32"/>
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
|
||||
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
|
||||
@ -17,13 +18,13 @@
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XyR-V7-rSB">
|
||||
<rect key="frame" x="12" y="187" width="174" height="120"/>
|
||||
<rect key="frame" x="12" y="192" width="174" height="115"/>
|
||||
<clipView key="contentView" id="l1m-DS-Lqo">
|
||||
<rect key="frame" x="1" y="1" width="172" height="118"/>
|
||||
<rect key="frame" x="1" y="1" width="172" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="dA2-Cq-7bP">
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="0.0"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<size key="intercellSpacing" width="3" height="2"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -81,11 +82,7 @@
|
||||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</clipView>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="120" id="MKU-qO-9av"/>
|
||||
</constraints>
|
||||
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="mYe-Sr-DFt">
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</scroller>
|
||||
@ -94,13 +91,13 @@
|
||||
</scroller>
|
||||
</scrollView>
|
||||
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qE9-v3-ohn">
|
||||
<rect key="frame" x="194" y="187" width="244" height="120"/>
|
||||
<rect key="frame" x="194" y="192" width="244" height="115"/>
|
||||
<clipView key="contentView" id="GTq-tY-QkB">
|
||||
<rect key="frame" x="1" y="1" width="242" height="118"/>
|
||||
<rect key="frame" x="1" y="1" width="242" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="Tx3-Ki-c38">
|
||||
<rect key="frame" x="0.0" y="0.0" width="242" height="0.0"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="242" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<size key="intercellSpacing" width="3" height="2"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -158,7 +155,6 @@
|
||||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</clipView>
|
||||
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="XhE-Mn-Zpf">
|
||||
<rect key="frame" x="1" y="110" width="228" height="14"/>
|
||||
@ -169,7 +165,7 @@
|
||||
</scroller>
|
||||
</scrollView>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1zA-Gt-YkJ">
|
||||
<rect key="frame" x="36" y="158" width="25" height="22"/>
|
||||
<rect key="frame" x="36" y="163" width="25" height="22"/>
|
||||
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" controlSize="small" borderStyle="border" inset="2" id="TVq-Ts-88H">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
@ -180,7 +176,7 @@
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y6D-zC-QG4">
|
||||
<rect key="frame" x="12" y="158" width="25" height="22"/>
|
||||
<rect key="frame" x="12" y="163" width="25" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="TOQ-4r-jZK"/>
|
||||
<constraint firstAttribute="width" constant="25" id="smP-m9-R2P"/>
|
||||
@ -195,13 +191,13 @@
|
||||
</connections>
|
||||
</button>
|
||||
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O23-4c-28w">
|
||||
<rect key="frame" x="12" y="40" width="174" height="82"/>
|
||||
<rect key="frame" x="12" y="40" width="174" height="87"/>
|
||||
<clipView key="contentView" id="p3k-iS-RPJ">
|
||||
<rect key="frame" x="1" y="1" width="172" height="80"/>
|
||||
<rect key="frame" x="1" y="1" width="172" height="85"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="rl8-9y-Ntt">
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="0.0"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="85"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<size key="intercellSpacing" width="3" height="2"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -259,7 +255,6 @@
|
||||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</clipView>
|
||||
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="VlN-l9-969">
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
@ -295,7 +290,7 @@
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Z1-wd-M5s">
|
||||
<rect key="frame" x="194" y="158" width="25" height="22"/>
|
||||
<rect key="frame" x="194" y="163" width="25" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="63A-85-ckX"/>
|
||||
</constraints>
|
||||
@ -309,7 +304,7 @@
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VLS-ei-tHV">
|
||||
<rect key="frame" x="218" y="158" width="25" height="22"/>
|
||||
<rect key="frame" x="218" y="163" width="25" height="22"/>
|
||||
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="2" id="OXW-BL-SkI">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
@ -336,7 +331,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SeZ-88-xfo">
|
||||
<rect key="frame" x="10" y="130" width="76" height="17"/>
|
||||
<rect key="frame" x="10" y="135" width="76" height="17"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Interpreters" id="Axx-Oq-E9U">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -344,7 +339,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="751" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="42" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7PY-LQ-Ob7" customClass="WrappingTextField" customModule="CotEditor" customModuleProvider="target">
|
||||
<rect key="frame" x="192" y="80" width="247" height="42"/>
|
||||
<rect key="frame" x="192" y="85" width="247" height="42"/>
|
||||
<textFieldCell key="cell" controlSize="small" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" title="The interpreters are used to determine the syntax style from the shebang in the document." id="dIj-Z5-J2j">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -393,6 +388,7 @@
|
||||
<constraint firstItem="qE9-v3-ohn" firstAttribute="leading" secondItem="XyR-V7-rSB" secondAttribute="trailing" constant="8" symbolic="YES" id="QAX-wY-ZGc"/>
|
||||
<constraint firstItem="HZ3-ju-Ncb" firstAttribute="leading" secondItem="O23-4c-28w" secondAttribute="leading" id="Qir-Xr-s2J"/>
|
||||
<constraint firstAttribute="bottom" secondItem="HZ3-ju-Ncb" secondAttribute="bottom" constant="12" id="RGQ-6x-Nsd"/>
|
||||
<constraint firstItem="O23-4c-28w" firstAttribute="height" secondItem="XyR-V7-rSB" secondAttribute="height" multiplier="0.75" id="SZ3-OB-4Z1"/>
|
||||
<constraint firstItem="6Z1-wd-M5s" firstAttribute="centerY" secondItem="VLS-ei-tHV" secondAttribute="centerY" id="Skz-mo-QgS"/>
|
||||
<constraint firstItem="XyR-V7-rSB" firstAttribute="trailing" secondItem="O23-4c-28w" secondAttribute="trailing" id="Tp5-dx-SmQ"/>
|
||||
<constraint firstItem="VLS-ei-tHV" firstAttribute="leading" secondItem="6Z1-wd-M5s" secondAttribute="trailing" constant="-1" id="WLF-Be-guz"/>
|
||||
@ -410,15 +406,13 @@
|
||||
<constraint firstItem="O23-4c-28w" firstAttribute="top" secondItem="7PY-LQ-Ob7" secondAttribute="top" id="mDY-PK-OS5"/>
|
||||
<constraint firstItem="6Z1-wd-M5s" firstAttribute="top" secondItem="qE9-v3-ohn" secondAttribute="bottom" constant="8" symbolic="YES" id="nHj-vZ-7bD"/>
|
||||
<constraint firstItem="qE9-v3-ohn" firstAttribute="leading" secondItem="6Z1-wd-M5s" secondAttribute="leading" id="nnu-7y-XNU"/>
|
||||
<constraint firstItem="7PY-LQ-Ob7" firstAttribute="leading" secondItem="O23-4c-28w" secondAttribute="trailing" constant="8" symbolic="YES" id="toe-YP-Yh5"/>
|
||||
<constraint firstItem="O23-4c-28w" firstAttribute="leading" secondItem="SeZ-88-xfo" secondAttribute="leading" id="uqN-oO-yZ7"/>
|
||||
<constraint firstItem="1zA-Gt-YkJ" firstAttribute="width" secondItem="y6D-zC-QG4" secondAttribute="width" id="vli-h1-Ntq"/>
|
||||
<constraint firstItem="7eZ-XF-dxf" firstAttribute="baseline" secondItem="I7p-Lu-lyM" secondAttribute="baseline" id="xh7-yj-dno"/>
|
||||
<constraint firstAttribute="trailing" secondItem="7PY-LQ-Ob7" secondAttribute="trailing" constant="13" id="xte-Ky-eYh"/>
|
||||
<constraint firstItem="SeZ-88-xfo" firstAttribute="top" secondItem="y6D-zC-QG4" secondAttribute="bottom" constant="12" id="xv4-ap-Glp"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7PY-LQ-Ob7" secondAttribute="trailing" constant="13" id="zZ8-eD-2UK"/>
|
||||
<constraint firstAttribute="trailing" secondItem="7PY-LQ-Ob7" secondAttribute="trailing" constant="13" id="zZ8-eD-2UK"/>
|
||||
</constraints>
|
||||
<point key="canvasLocation" x="142.5" y="187"/>
|
||||
<point key="canvasLocation" x="142" y="187"/>
|
||||
</customView>
|
||||
<objectController id="x4x-57-b26" userLabel="Style Controller">
|
||||
<declaredKeys>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user