From 1b35420dbf1de3b239c5553a2eec7c7b96b41ff3 Mon Sep 17 00:00:00 2001
From: Akop Karapetyan <dev@akop.org>
Date: Wed, 11 Dec 2019 22:22:53 -0800
Subject: [PATCH] Autolayout for About, Launcher, LogViewer

---
 .../xcode/Emulator/Base.lproj/About.xib       | 64 +++++++++++------
 .../xcode/Emulator/Base.lproj/Launcher.xib    | 68 ++++++++++++-------
 .../xcode/Emulator/Base.lproj/LogViewer.xib   | 35 ++++++----
 3 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/projectfiles/xcode/Emulator/Base.lproj/About.xib b/projectfiles/xcode/Emulator/Base.lproj/About.xib
index b4c485331..c585abbee 100644
--- a/projectfiles/xcode/Emulator/Base.lproj/About.xib
+++ b/projectfiles/xcode/Emulator/Base.lproj/About.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,43 +16,46 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="About" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="default" id="bTo-iM-Ec6">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
             <rect key="contentRect" x="966" y="610" width="562" height="357"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" wantsLayer="YES" id="6iv-BA-5dG">
                 <rect key="frame" x="0.0" y="0.0" width="562" height="357"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CEO-5c-W2b" customClass="FBWhitePanelView">
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="CEO-5c-W2b" customClass="FBWhitePanelView">
                         <rect key="frame" x="0.0" y="61" width="562" height="296"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
-                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bG4-40-Cpd">
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bG4-40-Cpd">
                                 <rect key="frame" x="20" y="20" width="256" height="256"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="256" id="JEl-27-WwO"/>
+                                    <constraint firstAttribute="height" constant="256" id="PZ1-XK-KvZ"/>
+                                </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="AppIconLarge" id="ylD-tH-SYP"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jjg-9S-eKH">
-                                <rect key="frame" x="284" y="231" width="260" height="45"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jjg-9S-eKH" userLabel="App title">
+                                <rect key="frame" x="282" y="238" width="262" height="38"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Doomsday Gap" id="ger-cR-GYg">
                                     <font key="font" metaFont="system" size="32"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7d6-UW-2Ea">
-                                <rect key="frame" x="284" y="216" width="260" height="17"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7d6-UW-2Ea" userLabel="Version number">
+                                <rect key="frame" x="282" y="216" width="262" height="14"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Our source was the New York Times" id="ORu-f3-vn2">
                                     <font key="font" metaFont="smallSystemBold"/>
                                     <color key="textColor" name="controlShadowColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" preferredMaxLayoutWidth="256" translatesAutoresizingMaskIntoConstraints="NO" id="quT-zG-Yo1">
-                                <rect key="frame" x="284" y="20" width="260" height="188"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="256" translatesAutoresizingMaskIntoConstraints="NO" id="quT-zG-Yo1" userLabel="Copyright blurb">
+                                <rect key="frame" x="282" y="32" width="262" height="176"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="258" id="3t0-b9-F0g"/>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="176" id="5Lc-o3-S2q"/>
+                                </constraints>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="mqu-HR-p0a">
                                     <font key="font" metaFont="system"/>
                                     <string key="title">Ⓒ 2019 Akop Karapetyan
© 2004-2019 Team FB Neo
© 2001 Dave

You may freely use, modify, and distribute both the FB Neo source code and binary, however restrictions apply to the FB Neo original material.

See License below for more information.
@@ -63,10 +66,24 @@
                                 </textFieldCell>
                             </textField>
                         </subviews>
+                        <constraints>
+                            <constraint firstItem="7d6-UW-2Ea" firstAttribute="trailing" secondItem="quT-zG-Yo1" secondAttribute="trailing" id="LeG-mU-MfC"/>
+                            <constraint firstAttribute="trailing" secondItem="quT-zG-Yo1" secondAttribute="trailing" constant="20" symbolic="YES" id="OkQ-jA-pKo"/>
+                            <constraint firstItem="Jjg-9S-eKH" firstAttribute="leading" secondItem="quT-zG-Yo1" secondAttribute="leading" id="cY1-sG-JGn"/>
+                            <constraint firstItem="Jjg-9S-eKH" firstAttribute="trailing" secondItem="quT-zG-Yo1" secondAttribute="trailing" id="dJ2-Pg-oeC"/>
+                            <constraint firstItem="7d6-UW-2Ea" firstAttribute="top" secondItem="Jjg-9S-eKH" secondAttribute="bottom" constant="8" symbolic="YES" id="dVH-OE-CoG"/>
+                            <constraint firstItem="Jjg-9S-eKH" firstAttribute="top" secondItem="CEO-5c-W2b" secondAttribute="top" constant="20" symbolic="YES" id="lee-ER-TVy"/>
+                            <constraint firstAttribute="bottom" secondItem="bG4-40-Cpd" secondAttribute="bottom" constant="20" symbolic="YES" id="m5x-kl-i1e"/>
+                            <constraint firstItem="bG4-40-Cpd" firstAttribute="top" secondItem="CEO-5c-W2b" secondAttribute="top" constant="20" symbolic="YES" id="oyY-ST-wIc"/>
+                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="quT-zG-Yo1" secondAttribute="bottom" constant="20" symbolic="YES" id="poR-YR-pgZ"/>
+                            <constraint firstItem="bG4-40-Cpd" firstAttribute="leading" secondItem="CEO-5c-W2b" secondAttribute="leading" constant="20" symbolic="YES" id="qCY-p5-Vzn"/>
+                            <constraint firstItem="7d6-UW-2Ea" firstAttribute="leading" secondItem="quT-zG-Yo1" secondAttribute="leading" id="yda-Ac-Pdf"/>
+                            <constraint firstItem="quT-zG-Yo1" firstAttribute="leading" secondItem="bG4-40-Cpd" secondAttribute="trailing" constant="8" symbolic="YES" id="zD1-aa-mxW"/>
+                            <constraint firstItem="quT-zG-Yo1" firstAttribute="top" secondItem="7d6-UW-2Ea" secondAttribute="bottom" constant="8" symbolic="YES" id="zTx-79-aWh"/>
+                        </constraints>
                     </customView>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Srz-bG-wC9">
-                        <rect key="frame" x="420" y="13" width="128" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Srz-bG-wC9">
+                        <rect key="frame" x="461" y="13" width="87" height="32"/>
                         <buttonCell key="cell" type="push" title="License" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Yaj-O6-wbH">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -76,6 +93,15 @@
                         </connections>
                     </button>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="CEO-5c-W2b" firstAttribute="top" secondItem="6iv-BA-5dG" secondAttribute="top" id="Gz1-Nl-NnN"/>
+                    <constraint firstAttribute="trailing" secondItem="CEO-5c-W2b" secondAttribute="trailing" id="S4d-lV-lRs"/>
+                    <constraint firstAttribute="trailing" secondItem="Srz-bG-wC9" secondAttribute="trailing" constant="20" symbolic="YES" id="Shw-Kc-psi"/>
+                    <constraint firstItem="CEO-5c-W2b" firstAttribute="leading" secondItem="6iv-BA-5dG" secondAttribute="leading" id="qdg-UD-caj"/>
+                    <constraint firstItem="Srz-bG-wC9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6iv-BA-5dG" secondAttribute="leading" constant="20" symbolic="YES" id="wKJ-Tw-JSN"/>
+                    <constraint firstAttribute="bottom" secondItem="Srz-bG-wC9" secondAttribute="bottom" constant="20" symbolic="YES" id="waL-jv-McM"/>
+                    <constraint firstItem="Srz-bG-wC9" firstAttribute="top" secondItem="CEO-5c-W2b" secondAttribute="bottom" constant="20" symbolic="YES" id="xGx-FC-Iml"/>
+                </constraints>
             </view>
             <point key="canvasLocation" x="173" y="205.5"/>
         </window>
diff --git a/projectfiles/xcode/Emulator/Base.lproj/Launcher.xib b/projectfiles/xcode/Emulator/Base.lproj/Launcher.xib
index 6db2a588b..55ba8070c 100644
--- a/projectfiles/xcode/Emulator/Base.lproj/Launcher.xib
+++ b/projectfiles/xcode/Emulator/Base.lproj/Launcher.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,14 +27,13 @@
                 <rect key="frame" x="0.0" y="0.0" width="594" height="549"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uLN-UU-wUx" customClass="FBDropFileScrollView">
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uLN-UU-wUx" customClass="FBDropFileScrollView">
                         <rect key="frame" x="-1" y="-1" width="596" height="551"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" id="Dhm-mF-Mxw">
+                        <clipView key="contentView" id="Dhm-mF-Mxw">
                             <rect key="frame" x="1" y="0.0" width="594" height="550"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <outlineView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="3Ac-aF-wVK" indentationPerLevel="16" outlineTableColumn="SfF-mw-sk3" id="LI1-S9-omw">
+                                <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="3Ac-aF-wVK" indentationPerLevel="16" outlineTableColumn="SfF-mw-sk3" id="LI1-S9-omw">
                                     <rect key="frame" x="0.0" y="0.0" width="594" height="525"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
@@ -43,7 +42,7 @@
                                     <tableColumns>
                                         <tableColumn editable="NO" width="73" minWidth="40" maxWidth="1000" id="sYe-77-mxg">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Status">
-                                                <font key="font" metaFont="controlContent" size="11"/>
+                                                <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
@@ -59,12 +58,12 @@
                                         </tableColumn>
                                         <tableColumn editable="NO" width="116" minWidth="40" maxWidth="1000" id="SfF-mw-sk3">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Name">
-                                                <font key="font" metaFont="controlContent" size="11"/>
+                                                <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="AVl-5b-hSg">
-                                                <font key="font" metaFont="controlContent" size="11"/>
+                                                <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -75,12 +74,12 @@
                                         </tableColumn>
                                         <tableColumn editable="NO" width="396" minWidth="40" maxWidth="1000" id="HLR-VA-LE2">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Title">
-                                                <font key="font" metaFont="controlContent" size="11"/>
+                                                <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Qf5-Np-ORW">
-                                                <font key="font" metaFont="controlContent" size="11"/>
+                                                <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -100,6 +99,10 @@
                                 </outlineView>
                             </subviews>
                         </clipView>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="551" id="idy-SK-Zk5"/>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="596" id="jy2-Q4-zO9"/>
+                        </constraints>
                         <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="GKm-KM-6zH">
                             <rect key="frame" x="1" y="535" width="594" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
@@ -117,6 +120,12 @@
                         </connections>
                     </scrollView>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="uLN-UU-wUx" secondAttribute="trailing" constant="-1" id="A4j-TA-gK2"/>
+                    <constraint firstItem="uLN-UU-wUx" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="-1" id="HiR-f2-iJv"/>
+                    <constraint firstAttribute="bottom" secondItem="uLN-UU-wUx" secondAttribute="bottom" constant="-1" id="bUh-HJ-Ps7"/>
+                    <constraint firstItem="uLN-UU-wUx" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="-1" id="riQ-vq-ikW"/>
+                </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="uIo-I6-8Np"/>
@@ -137,31 +146,28 @@
         <window title="Import in Progress..." allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="hEA-LJ-CM5" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="272" y="172" width="407" height="86"/>
+            <rect key="contentRect" x="272" y="172" width="407" height="80"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="epq-bd-srL">
-                <rect key="frame" x="0.0" y="0.0" width="407" height="86"/>
+                <rect key="frame" x="0.0" y="0.0" width="407" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="1" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="CGz-AO-sJG">
-                        <rect key="frame" x="20" y="33" width="289" height="20"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <progressIndicator wantsLayer="YES" maxValue="1" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="CGz-AO-sJG">
+                        <rect key="frame" x="20" y="19" width="307" height="20"/>
                     </progressIndicator>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wTx-rb-XUh">
-                        <rect key="frame" x="18" y="60" width="319" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wTx-rb-XUh">
+                        <rect key="frame" x="18" y="46" width="371" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="ziH-TJ-CzP">
-                            <font key="font" metaFont="controlContent" size="11"/>
+                            <font key="font" metaFont="message" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QBI-GE-Mwp">
-                        <rect key="frame" x="312" y="28" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QBI-GE-Mwp">
+                        <rect key="frame" x="330" y="14" width="62" height="27"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ChL-9J-tsE">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="controlContent" size="11"/>
+                            <font key="font" metaFont="message" size="11"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 Gw
 </string>
@@ -171,8 +177,20 @@ Gw
                         </connections>
                     </button>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="QBI-GE-Mwp" secondAttribute="trailing" constant="20" symbolic="YES" id="0De-ap-gwT"/>
+                    <constraint firstItem="QBI-GE-Mwp" firstAttribute="leading" secondItem="CGz-AO-sJG" secondAttribute="trailing" constant="8" symbolic="YES" id="5PE-IS-Kny"/>
+                    <constraint firstItem="CGz-AO-sJG" firstAttribute="top" secondItem="wTx-rb-XUh" secondAttribute="bottom" constant="8" symbolic="YES" id="9yC-z6-hAA"/>
+                    <constraint firstAttribute="bottom" secondItem="QBI-GE-Mwp" secondAttribute="bottom" constant="20" symbolic="YES" id="Eyb-oA-y8e"/>
+                    <constraint firstAttribute="trailing" secondItem="wTx-rb-XUh" secondAttribute="trailing" constant="20" symbolic="YES" id="JZv-12-9FB"/>
+                    <constraint firstItem="wTx-rb-XUh" firstAttribute="top" secondItem="epq-bd-srL" secondAttribute="top" constant="20" symbolic="YES" id="OsP-qE-Zdd"/>
+                    <constraint firstItem="QBI-GE-Mwp" firstAttribute="top" secondItem="wTx-rb-XUh" secondAttribute="bottom" constant="8" symbolic="YES" id="WNM-57-Qcb"/>
+                    <constraint firstItem="wTx-rb-XUh" firstAttribute="leading" secondItem="epq-bd-srL" secondAttribute="leading" constant="20" symbolic="YES" id="cv1-So-faD"/>
+                    <constraint firstItem="CGz-AO-sJG" firstAttribute="leading" secondItem="epq-bd-srL" secondAttribute="leading" constant="20" symbolic="YES" id="mhB-B1-C30"/>
+                    <constraint firstAttribute="bottom" secondItem="CGz-AO-sJG" secondAttribute="bottom" constant="20" symbolic="YES" id="vXT-nh-W8t"/>
+                </constraints>
             </view>
-            <point key="canvasLocation" x="147" y="682"/>
+            <point key="canvasLocation" x="146.5" y="679"/>
         </window>
     </objects>
 </document>
diff --git a/projectfiles/xcode/Emulator/Base.lproj/LogViewer.xib b/projectfiles/xcode/Emulator/Base.lproj/LogViewer.xib
index 35ea69a25..c0c9c5e94 100644
--- a/projectfiles/xcode/Emulator/Base.lproj/LogViewer.xib
+++ b/projectfiles/xcode/Emulator/Base.lproj/LogViewer.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,40 +18,49 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowCollectionBehavior key="collectionBehavior" fullScreenNone="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+            <rect key="contentRect" x="196" y="240" width="480" height="360"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <scrollView appearanceType="aqua" fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WFe-VE-C5K">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="hh4-rh-IO2">
-                            <rect key="frame" x="0.0" y="0.0" width="465" height="270"/>
+                    <scrollView appearanceType="aqua" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WFe-VE-C5K">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="hh4-rh-IO2">
+                            <rect key="frame" x="0.0" y="0.0" width="465" height="360"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textView ambiguous="YES" editable="NO" importsGraphics="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" allowsDocumentBackgroundColorChange="YES" textCompletion="NO" id="vYG-4Q-baE">
-                                    <rect key="frame" x="0.0" y="0.0" width="465" height="270"/>
+                                <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" allowsDocumentBackgroundColorChange="YES" textCompletion="NO" id="vYG-4Q-baE">
+                                    <rect key="frame" x="0.0" y="0.0" width="465" height="360"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                    <size key="minSize" width="465" height="270"/>
+                                    <size key="minSize" width="465" height="360"/>
                                     <size key="maxSize" width="546" height="10000000"/>
                                     <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
                             </subviews>
                         </clipView>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="480" id="6sl-90-SFF"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="360" id="Nd2-VS-e1b"/>
+                        </constraints>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4uN-ka-KGX">
                             <rect key="frame" x="-100" y="-100" width="225" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="RwH-yS-6xz">
-                            <rect key="frame" x="465" y="0.0" width="15" height="270"/>
+                            <rect key="frame" x="465" y="0.0" width="15" height="360"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="WFe-VE-C5K" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="8lg-gh-8T4"/>
+                    <constraint firstItem="WFe-VE-C5K" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="CB9-fd-9A4"/>
+                    <constraint firstAttribute="trailing" secondItem="WFe-VE-C5K" secondAttribute="trailing" id="KxR-0L-OPx"/>
+                    <constraint firstAttribute="bottom" secondItem="WFe-VE-C5K" secondAttribute="bottom" id="Mwt-Kv-9wQ"/>
+                </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="rqW-a3-wIV"/>