Merge remote-tracking branch 'upstream/Integration' into feat/frame_pacing_metal
This commit is contained in:
commit
45895fa8bf
4 files changed
+27
-25
No files matched your search
@@ -1250,21 +1250,21 @@
|
||||
<action selector="undoTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="54z-kO-oCo"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="20" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qJs-n8-eV7" userLabel="Trash">
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OId-gk-Wkg" userLabel="Load">
|
||||
<rect key="frame" x="120" y="0.0" width="50" height="50"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="50" id="0UR-Tv-X69"/>
|
||||
<constraint firstAttribute="width" constant="50" id="MyN-Qt-jL7"/>
|
||||
<constraint firstAttribute="width" constant="50" id="XlA-qH-mSO"/>
|
||||
<constraint firstAttribute="height" constant="50" id="xSe-dW-zjg"/>
|
||||
</constraints>
|
||||
<color key="tintColor" systemColor="systemTealColor"/>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal">
|
||||
<color key="titleColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
|
||||
<imageReference key="image" image="trash.fill" catalog="system" symbolScale="large"/>
|
||||
<imageReference key="image" image="tray.full.fill" catalog="system" symbolScale="large"/>
|
||||
<preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="bold"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="trashCanTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="6s3-Wc-6us"/>
|
||||
<action selector="loadTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="ZCn-S3-8em"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button autoresizesSubviews="NO" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uda-zt-xrG" userLabel="Save">
|
||||
@@ -1289,21 +1289,21 @@
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EPu-dl-Tv8">
|
||||
<rect key="frame" x="360" y="0.0" width="50" height="50"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OId-gk-Wkg" userLabel="Load">
|
||||
<button opaque="NO" tag="20" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qJs-n8-eV7" userLabel="Trash">
|
||||
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="50" id="XlA-qH-mSO"/>
|
||||
<constraint firstAttribute="height" constant="50" id="xSe-dW-zjg"/>
|
||||
<constraint firstAttribute="height" constant="50" id="0UR-Tv-X69"/>
|
||||
<constraint firstAttribute="width" constant="50" id="MyN-Qt-jL7"/>
|
||||
</constraints>
|
||||
<color key="tintColor" systemColor="systemTealColor"/>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal">
|
||||
<color key="titleColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
|
||||
<imageReference key="image" image="tray.full.fill" catalog="system" symbolScale="large"/>
|
||||
<imageReference key="image" image="trash.fill" catalog="system" symbolScale="large"/>
|
||||
<preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="bold"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="loadTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="ZCn-S3-8em"/>
|
||||
<action selector="trashCanTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="6s3-Wc-6us"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
@@ -1658,7 +1658,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dev-Ck-vTF" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2804" y="992"/>
|
||||
<point key="canvasLocation" x="2530" y="958"/>
|
||||
</scene>
|
||||
<!--Profiles Table View Controller-->
|
||||
<scene sceneID="W0E-wz-n2b">
|
||||
|
||||
Reference in new issue
Block a user