Revision: 12465
http://sourceforge.net/p/skim-app/code/12465
Author: hofman
Date: 2021-10-14 15:42:49 +0000 (Thu, 14 Oct 2021)
Log Message:
-----------
Add placeholder height constraint and use auto resizing mask layout for various
table and outline views
Modified Paths:
--------------
trunk/Base.lproj/BookmarksWindow.xib
trunk/Base.lproj/DownloadsWindow.xib
trunk/Base.lproj/TransitionSheet.xib
trunk/NotesDocument.xib
Modified: trunk/Base.lproj/BookmarksWindow.xib
===================================================================
--- trunk/Base.lproj/BookmarksWindow.xib 2021-10-12 15:56:21 UTC (rev
12464)
+++ trunk/Base.lproj/BookmarksWindow.xib 2021-10-14 15:42:49 UTC (rev
12465)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="18122"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19162"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -26,7 +25,7 @@
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
<value key="minSize" type="size" width="300" height="100"/>
<view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="400" height="250"/>
+ <rect key="frame" x="0.0" y="0.0" width="400" height="253"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO"
id="37" customClass="SKStatusBar">
@@ -36,13 +35,17 @@
</constraints>
</customView>
<scrollView borderType="none" autohidesScrollers="YES"
horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18"
verticalPageScroll="10" usesPredominantAxisScrolling="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="56">
- <rect key="frame" x="0.0" y="22" width="400"
height="229"/>
+ <rect key="frame" x="0.0" y="22" width="400"
height="232"/>
<clipView key="contentView" id="hZw-FP-8cA">
- <rect key="frame" x="0.0" y="0.0" width="400"
height="229"/>
+ <rect key="frame" x="0.0" y="0.0" width="400"
height="232"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<subviews>
- <outlineView verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly"
alternatingRowBackgroundColors="YES" columnReordering="NO" typeSelect="NO"
autosaveName="SKBookmarksTable" rowHeight="16" headerView="100" viewBased="YES"
indentationPerLevel="16" outlineTableColumn="58"
translatesAutoresizingMaskIntoConstraints="NO" id="57"
customClass="SKOutlineView">
- <rect key="frame" x="0.0" y="25"
width="400" height="204"/>
+ <outlineView verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly"
alternatingRowBackgroundColors="YES" columnReordering="NO" typeSelect="NO"
autosaveName="SKBookmarksTable" rowHeight="16" headerView="100" viewBased="YES"
indentationPerLevel="16" outlineTableColumn="58" id="57"
customClass="SKOutlineView">
+ <rect key="frame" x="0.0" y="25"
width="400" height="207"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <constraints>
+ <constraint firstAttribute="height"
constant="204" placeholder="YES" id="ZIF-gY-LgS"/>
+ </constraints>
<size key="intercellSpacing" width="0.0"
height="2"/>
<color key="backgroundColor"
name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor"
catalog="System" colorSpace="catalog"/>
@@ -221,10 +224,6 @@
</connections>
</outlineView>
</subviews>
- <constraints>
- <constraint firstItem="57"
firstAttribute="leading" secondItem="hZw-FP-8cA" secondAttribute="leading"
id="V5j-fa-jFl"/>
- <constraint firstItem="57"
firstAttribute="top" secondItem="hZw-FP-8cA" secondAttribute="top"
constant="25" id="e2t-Vt-qwa"/>
- </constraints>
</clipView>
<constraints>
<constraint firstAttribute="height"
relation="greaterThanOrEqual" constant="100" id="Q91-7c-M9i"/>
Modified: trunk/Base.lproj/DownloadsWindow.xib
===================================================================
--- trunk/Base.lproj/DownloadsWindow.xib 2021-10-12 15:56:21 UTC (rev
12464)
+++ trunk/Base.lproj/DownloadsWindow.xib 2021-10-14 15:42:49 UTC (rev
12465)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19162"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -20,21 +19,21 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES"
miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES"
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="242" y="450" width="360" height="316"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="360" height="316"/>
+ <rect key="frame" x="0.0" y="0.0" width="355" height="310"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView borderType="none" autohidesScrollers="YES"
horizontalLineScroll="34" horizontalPageScroll="10" verticalLineScroll="34"
verticalPageScroll="10" hasHorizontalScroller="NO"
usesPredominantAxisScrolling="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="10">
- <rect key="frame" x="0.0" y="0.0" width="360"
height="316"/>
+ <rect key="frame" x="0.0" y="0.0" width="355"
height="310"/>
<clipView key="contentView" id="nnO-PL-kuG">
- <rect key="frame" x="0.0" y="0.0" width="360"
height="316"/>
+ <rect key="frame" x="0.0" y="0.0" width="355"
height="310"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential"
alternatingRowBackgroundColors="YES" columnReordering="NO"
multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="32"
viewBased="YES" id="11" customClass="SKTableView">
- <rect key="frame" x="0.0" y="0.0"
width="360" height="316"/>
- <autoresizingMask key="autoresizingMask"/>
+ <rect key="frame" x="0.0" y="0.0"
width="355" height="310"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3"
height="2"/>
<color key="backgroundColor"
name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor"
catalog="System" colorSpace="catalog"/>
@@ -41,7 +40,6 @@
<tableColumns>
<tableColumn identifier="icon"
editable="NO" width="32" minWidth="32" maxWidth="32" id="14">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font"
metaFont="smallSystem"/>
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
@@ -49,11 +47,11 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="FGh-go-9hM">
- <rect key="frame" x="1"
y="1" width="32" height="32"/>
+ <rect key="frame" x="11"
y="1" width="37" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView
horizontalHuggingPriority="251" verticalHuggingPriority="251"
translatesAutoresizingMaskIntoConstraints="NO" id="8JT-Pg-4k7">
- <rect key="frame"
x="0.0" y="0.0" width="32" height="32"/>
+ <rect key="frame"
x="0.0" y="-3" width="37" height="38"/>
<imageCell
key="cell" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" image="NSActionTemplate" id="nD0-44-4IZ"/>
<connections>
<binding
destination="FGh-go-9hM" name="value" keyPath="objectValue.fileIcon"
id="Fya-8m-Ay1"/>
@@ -72,9 +70,8 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
- <tableColumn identifier="progress"
editable="NO" width="284" minWidth="40" maxWidth="1000" id="12">
+ <tableColumn identifier="progress"
editable="NO" width="250" minWidth="40" maxWidth="1000" id="12">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font"
metaFont="smallSystem"/>
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
@@ -86,11 +83,11 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="DJL-SM-8pU"
customClass="SKProgressTableCellView">
- <rect key="frame" x="36"
y="1" width="284" height="32"/>
+ <rect key="frame" x="51"
y="1" width="250" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="R2Q-ln-3b7">
- <rect key="frame"
x="6" y="16" width="272" height="16"/>
+ <rect key="frame"
x="6" y="17" width="238" height="15"/>
<textFieldCell
key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES"
id="XbQ-e9-yZ2">
<font
key="font" metaFont="cellTitle"/>
<color
key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -101,7 +98,7 @@
</connections>
</textField>
<textField
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="5iX-RC-aDg">
- <rect key="frame"
x="6" y="2" width="272" height="13"/>
+ <rect key="frame"
x="6" y="2" width="238" height="13"/>
<textFieldCell
key="cell" scrollable="YES" lineBreakMode="clipping"
sendsActionOnEndEditing="YES" id="ZFf-Fi-56G">
<font
key="font" metaFont="system" size="10"/>
<color
key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -113,7 +110,7 @@
</connections>
</textField>
<progressIndicator
wantsLayer="YES" maxValue="100" displayedWhenStopped="NO" controlSize="small"
style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="FBo-U7-QkJ">
- <rect key="frame"
x="8" y="2" width="268" height="12"/>
+ <rect key="frame"
x="8" y="2" width="234" height="12"/>
<constraints>
<constraint
firstAttribute="height" constant="12" id="jjL-Bf-RhJ"/>
</constraints>
@@ -155,7 +152,6 @@
</tableColumn>
<tableColumn identifier="resume"
width="16" minWidth="16" maxWidth="16" id="25">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font"
metaFont="smallSystem"/>
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
@@ -166,7 +162,7 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="K90-Ek-F7r"
customClass="SKControlTableCellView">
- <rect key="frame" x="323"
y="1" width="16" height="32"/>
+ <rect key="frame" x="304"
y="1" width="16" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="Xeh-Nt-nDR">
@@ -202,7 +198,6 @@
</tableColumn>
<tableColumn identifier="cancel"
width="16" minWidth="16" maxWidth="16" id="16">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font"
metaFont="smallSystem"/>
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
@@ -213,11 +208,11 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView id="tAb-gc-XcH"
customClass="SKControlTableCellView">
- <rect key="frame" x="342"
y="1" width="16" height="32"/>
+ <rect key="frame" x="323"
y="1" width="20" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="NLq-UV-ucb">
- <rect key="frame"
x="0.0" y="8" width="16" height="16"/>
+ <rect key="frame"
x="2" y="8" width="16" height="16"/>
<constraints>
<constraint
firstAttribute="height" constant="16" id="W3D-G6-OPs"/>
<constraint
firstAttribute="width" secondItem="NLq-UV-ucb" secondAttribute="height"
multiplier="1:1" id="kKx-zO-svk"/>
@@ -273,6 +268,7 @@
<constraint firstItem="10" firstAttribute="top"
secondItem="6" secondAttribute="top" id="vuh-F1-h2P"/>
</constraints>
</view>
+ <point key="canvasLocation" x="139" y="126"/>
</window>
<button toolTip="Remove all finished downloads"
verticalHuggingPriority="750" id="9">
<rect key="frame" x="0.0" y="0.0" width="117" height="25"/>
@@ -292,6 +288,6 @@
</menu>
</objects>
<resources>
- <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
</resources>
</document>
Modified: trunk/Base.lproj/TransitionSheet.xib
===================================================================
--- trunk/Base.lproj/TransitionSheet.xib 2021-10-12 15:56:21 UTC (rev
12464)
+++ trunk/Base.lproj/TransitionSheet.xib 2021-10-14 15:42:49 UTC (rev
12465)
@@ -276,7 +276,7 @@
<imageCell key="dataCell"
controlSize="small" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" id="283"/>
<prototypeCellViews>
<tableCellView id="FFB-6b-AmI">
- <rect key="frame" x="1"
y="1" width="37" height="32"/>
+ <rect key="frame" x="11"
y="1" width="37" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView
horizontalHuggingPriority="251" verticalHuggingPriority="251"
translatesAutoresizingMaskIntoConstraints="NO" id="dsv-wV-Xfh"
customClass="SKThumbnailImageView">
@@ -307,7 +307,7 @@
<imageCell key="dataCell"
controlSize="small" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" id="c3h-AL-uy4"/>
<prototypeCellViews>
<tableCellView id="Y1w-el-Llx">
- <rect key="frame" x="41"
y="1" width="32" height="32"/>
+ <rect key="frame" x="51"
y="1" width="32" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView
horizontalHuggingPriority="251" verticalHuggingPriority="251"
translatesAutoresizingMaskIntoConstraints="NO" id="c4J-xl-Tkh"
customClass="SKThumbnailImageView">
@@ -330,7 +330,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
- <tableColumn identifier="page"
editable="NO" width="47" minWidth="10" maxWidth="1000" id="281">
+ <tableColumn identifier="page"
editable="NO" width="18" minWidth="10" maxWidth="1000" id="281">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -343,11 +343,11 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView id="Ak4-gE-KVg">
- <rect key="frame" x="76"
y="1" width="51" height="32"/>
+ <rect key="frame" x="86"
y="1" width="22" height="32"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="Gef-ew-Rw5">
- <rect key="frame"
x="0.0" y="9" width="51" height="14"/>
+ <rect key="frame"
x="0.0" y="9" width="22" height="14"/>
<textFieldCell
key="cell" controlSize="small" lineBreakMode="truncatingTail"
sendsActionOnEndEditing="YES" alignment="left" id="KRm-gQ-Tj2">
<font
key="font" metaFont="message" size="11"/>
<color
key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
Modified: trunk/NotesDocument.xib
===================================================================
--- trunk/NotesDocument.xib 2021-10-12 15:56:21 UTC (rev 12464)
+++ trunk/NotesDocument.xib 2021-10-14 15:42:49 UTC (rev 12465)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="17701"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19162"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -24,19 +23,22 @@
<rect key="contentRect" x="302" y="310" width="480" height="360"/>
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
<value key="minSize" type="size" width="213" height="107"/>
- <view key="contentView" misplaced="YES" id="6">
- <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="504" height="363"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView borderType="none" autohidesScrollers="YES"
horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19"
verticalPageScroll="10" hasHorizontalScroller="NO"
usesPredominantAxisScrolling="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="48"
customClass="SKScrollView">
- <rect key="frame" x="0.0" y="22" width="504"
height="114"/>
+ <rect key="frame" x="0.0" y="22" width="504"
height="342"/>
<clipView key="contentView" id="C4R-aP-Zng">
- <rect key="frame" x="0.0" y="0.0" width="504"
height="114"/>
+ <rect key="frame" x="0.0" y="0.0" width="504"
height="342"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly"
alternatingRowBackgroundColors="YES" typeSelect="NO"
autosaveName="SKNotesDocumentOutlineView" headerView="105" viewBased="YES"
floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="50" id="49"
customClass="SKNoteOutlineView">
- <rect key="frame" x="0.0" y="0.0"
width="504" height="89"/>
+ <rect key="frame" x="0.0" y="0.0"
width="504" height="317"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <constraints>
+ <constraint firstAttribute="height"
constant="314" placeholder="YES" id="JoN-Uw-keJ"/>
+ </constraints>
<size key="intercellSpacing" width="3"
height="2"/>
<color key="backgroundColor"
name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor"
catalog="System" colorSpace="catalog"/>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
