From 694f08052177b8233fa3e08b0c2bc1a965cda7e3 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 1 Jan 2022 13:57:56 -0500
Subject: [PATCH] Reduce the height of the left panel content so it does not
 overlap with the panel selector on macOS 12.

---
 en.lproj/Debugger.xib | 67 ++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/en.lproj/Debugger.xib b/en.lproj/Debugger.xib
index 7a323ca..e225920 100644
--- a/en.lproj/Debugger.xib
+++ b/en.lproj/Debugger.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -25,7 +25,7 @@
             <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="363" y="277" width="769" height="501"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="8">
                 <rect key="frame" x="0.0" y="0.0" width="769" height="501"/>
@@ -40,7 +40,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <subviews>
                                     <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mRx-aY-U5x">
-                                        <rect key="frame" x="-49.5" y="478" width="304" height="25"/>
+                                        <rect key="frame" x="-49" y="478" width="304" height="25"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedRounded" trackingMode="selectOne" id="Qgr-HU-m0Y">
                                             <font key="font" metaFont="system"/>
@@ -58,32 +58,31 @@
                                         </segmentedCell>
                                     </segmentedControl>
                                     <tabView fixedFrame="YES" type="noTabsNoBorder" initialItem="jVS-VL-LBw" translatesAutoresizingMaskIntoConstraints="NO" id="XU1-a6-Ws7">
-                                        <rect key="frame" x="0.0" y="0.0" width="211" height="480"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="211" height="479"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <font key="font" metaFont="system"/>
                                         <tabViewItems>
                                             <tabViewItem label="Variables" identifier="1" id="jVS-VL-LBw">
-                                                <view key="view" ambiguous="YES" id="cqt-pj-ASk">
-                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="480"/>
+                                                <view key="view" id="cqt-pj-ASk">
+                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="479"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                                                            <rect key="frame" x="-1" y="-1" width="301" height="482"/>
+                                                            <rect key="frame" x="-1" y="-1" width="301" height="481"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                            <clipView key="contentView" ambiguous="YES" id="oXX-ZU-YDL">
-                                                                <rect key="frame" x="1" y="0.0" width="299" height="481"/>
+                                                            <clipView key="contentView" id="oXX-ZU-YDL">
+                                                                <rect key="frame" x="1" y="1" width="299" height="479"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <subviews>
                                                                     <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="467" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="14" id="12">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="299" height="458"/>
-                                                                        <autoresizingMask key="autoresizingMask"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="299" height="456"/>
+                                                                        <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"/>
                                                                         <tableColumns>
-                                                                            <tableColumn editable="NO" width="76.5" minWidth="16" maxWidth="1000" id="14">
+                                                                            <tableColumn editable="NO" width="73.5" minWidth="16" maxWidth="1000" id="14">
                                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Variable">
-                                                                                    <font key="font" metaFont="smallSystem"/>
                                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                                     <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                                                                 </tableHeaderCell>
@@ -101,9 +100,8 @@
                                                                                     </binding>
                                                                                 </connections>
                                                                             </tableColumn>
-                                                                            <tableColumn editable="NO" width="97.5" minWidth="8" maxWidth="1000" id="13">
+                                                                            <tableColumn editable="NO" width="94.5" minWidth="8" maxWidth="1000" id="13">
                                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Value">
-                                                                                    <font key="font" metaFont="smallSystem"/>
                                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                                     <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                                                                 </tableHeaderCell>
@@ -122,9 +120,8 @@
                                                                                     </binding>
                                                                                 </connections>
                                                                             </tableColumn>
-                                                                            <tableColumn editable="NO" width="115.75439" minWidth="29.754390000000001" maxWidth="1000" id="81">
+                                                                            <tableColumn editable="NO" width="112.75439" minWidth="29.754390000000001" maxWidth="1000" id="81">
                                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Type">
-                                                                                    <font key="font" metaFont="smallSystem"/>
                                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                                     <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                                                 </tableHeaderCell>
@@ -150,14 +147,14 @@
                                                                 </subviews>
                                                             </clipView>
                                                             <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="466">
-                                                                <rect key="frame" x="1" y="11" width="53" height="16"/>
+                                                                <rect key="frame" x="1" y="465" width="299" height="16"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                             </scroller>
                                                             <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="465">
                                                                 <rect key="frame" x="38" y="23" width="16" height="4"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                             </scroller>
-                                                            <tableHeaderView key="headerView" id="467">
+                                                            <tableHeaderView key="headerView" wantsLayer="YES" id="467">
                                                                 <rect key="frame" x="0.0" y="0.0" width="299" height="23"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                             </tableHeaderView>
@@ -189,19 +186,18 @@
                                         <rect key="frame" x="0.0" y="0.0" width="560" height="234"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <clipView key="contentView" id="0J4-i7-RBa">
-                                            <rect key="frame" x="1" y="0.0" width="558" height="233"/>
+                                            <rect key="frame" x="1" y="1" width="558" height="232"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="495" id="16">
-                                                    <rect key="frame" x="0.0" y="0.0" width="558" height="210"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="558" height="209"/>
                                                     <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"/>
                                                     <tableColumns>
-                                                        <tableColumn identifier="index" editable="NO" width="29" minWidth="10" maxWidth="30" id="17">
+                                                        <tableColumn identifier="index" editable="NO" width="26.5" minWidth="10" maxWidth="30" id="17">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="#">
-                                                                <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                                             </tableHeaderCell>
@@ -220,9 +216,8 @@
                                                                 </binding>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="filename" editable="NO" width="131" minWidth="8" maxWidth="1000" id="18">
+                                                        <tableColumn identifier="filename" editable="NO" width="128.5" minWidth="8" maxWidth="1000" id="18">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="File">
-                                                                <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                                             </tableHeaderCell>
@@ -237,9 +232,8 @@
                                                                 <binding destination="36" name="value" keyPath="arrangedObjects.filename" id="44"/>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="lineNumber" editable="NO" width="150" minWidth="26" maxWidth="1000" id="42">
+                                                        <tableColumn identifier="lineNumber" editable="NO" width="147.5" minWidth="26" maxWidth="1000" id="42">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Line">
-                                                                <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                             </tableHeaderCell>
@@ -258,9 +252,8 @@
                                                                 </binding>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="function" editable="NO" width="236" minWidth="50.0625" maxWidth="1000" id="48">
+                                                        <tableColumn identifier="function" editable="NO" width="234.5" minWidth="50.0625" maxWidth="1000" id="48">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Function">
-                                                                <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                             </tableHeaderCell>
@@ -294,7 +287,7 @@
                                             <rect key="frame" x="368" y="17" width="15" height="190"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </scroller>
-                                        <tableHeaderView key="headerView" id="495">
+                                        <tableHeaderView key="headerView" wantsLayer="YES" id="495">
                                             <rect key="frame" x="0.0" y="0.0" width="558" height="23"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableHeaderView>
@@ -430,7 +423,7 @@
                             </connections>
                         </textField>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="0DD9463E-4676-43E6-B885-7A9CB1137956" label="Attached" paletteLabel="" id="593">
+                    <toolbarItem implicitItemIdentifier="0DD9463E-4676-43E6-B885-7A9CB1137956" label="Attached" paletteLabel="" title="Attached" id="593">
                         <nil key="toolTip"/>
                         <size key="minSize" width="83" height="19"/>
                         <size key="maxSize" width="100" height="20"/>
@@ -480,6 +473,7 @@
                 <string>contexts.Locals</string>
                 <string>variables</string>
             </declaredKeys>
+            <classReference key="objectClass" className="StackFrame"/>
             <connections>
                 <binding destination="-2" name="contentArray" keyPath="model.stack" id="myv-aO-biI"/>
             </connections>
@@ -491,6 +485,7 @@
                 <string>fullName</string>
                 <string>displayType</string>
             </declaredKeys>
+            <classReference key="objectClass" className="VariableNode"/>
             <connections>
                 <binding destination="36" name="contentArray" keyPath="selection.variables" id="568"/>
             </connections>
@@ -499,7 +494,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES" nonactivatingPanel="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="984" y="432" width="400" height="400"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" id="570">
                 <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -507,11 +502,11 @@
                     <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="575">
                         <rect key="frame" x="-1" y="-1" width="402" height="402"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="aGW-Gu-aWn">
+                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="aGW-Gu-aWn">
                             <rect key="frame" x="0.0" y="0.0" width="402" height="402"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
-                                <textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="578">
+                                <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="578">
                                     <rect key="frame" x="0.0" y="0.0" width="402" height="402"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-- 
2.22.5