mirror of
https://github.com/trudnai/Steve2.git
synced 2025-04-08 13:37:17 +00:00
testing textDisplay resize
This commit is contained in:
tudnai
parent
f4cd241f59
commit
e3ba8f754a
@ -11,6 +11,8 @@
|
||||
320B3FC424AD88B0005EA133 /* power.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 320B3FC324AD88B0005EA133 /* power.png */; };
|
||||
320B4FC124B182DE00070038 /* Apple Disk II.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 320B4FC024B182DD00070038 /* Apple Disk II.png */; };
|
||||
320F2A8824CFD74100671B35 /* Steve2Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 320F2A8724CFD74000671B35 /* Steve2Icon.icns */; };
|
||||
321D9C3B287373D20036E22F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; };
|
||||
321D9C45287373D30036E22F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; };
|
||||
32326B0C2630A1910076F839 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; };
|
||||
323D042E248980600086A901 /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 323D042D248980600086A901 /* Preferences.storyboard */; };
|
||||
323D043024898AB70086A901 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 323D042F24898AB70086A901 /* PreferencesViewController.swift */; };
|
||||
@ -70,8 +72,6 @@
|
||||
3268B9E927DEDD61003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom in Copy ROM Images */ = {isa = PBXBuildFile; fileRef = 3268B99027DEAC84003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom */; };
|
||||
326B56E524AD8E89009BA0AC /* gobackward.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 326B56E424AD8E89009BA0AC /* gobackward.png */; };
|
||||
326B56E724AD906D009BA0AC /* doc.text.viewfinder.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 326B56E624AD906D009BA0AC /* doc.text.viewfinder.png */; };
|
||||
3277D779273AE0DA00749544 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; };
|
||||
3277D783273AE0DC00749544 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; };
|
||||
3277D7A3273C603600749544 /* DisplayScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3277D7A2273C603600749544 /* DisplayScrollView.swift */; };
|
||||
3277D7A4273C603600749544 /* DisplayScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3277D7A2273C603600749544 /* DisplayScrollView.swift */; };
|
||||
32799F7A264B1A5700255669 /* DisplayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32544194264A6C1600B7E3ED /* DisplayView.swift */; };
|
||||
@ -545,6 +545,7 @@
|
||||
320F2A8A24D0001600671B35 /* 6502_und.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 6502_und.h; sourceTree = "<group>"; };
|
||||
320F2A8B24D0828600671B35 /* 6502_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_C.h; sourceTree = "<group>"; };
|
||||
320F2A9924D4DE8400671B35 /* 6502_C_Rockwell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_C_Rockwell.h; sourceTree = "<group>"; };
|
||||
321D9BDC287373000036E22F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = A2Mac/Base.lproj/Main_copy.storyboard; sourceTree = "<group>"; };
|
||||
323D042D248980600086A901 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = "<group>"; };
|
||||
323D042F24898AB70086A901 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = "<group>"; };
|
||||
323D04312489BFD80086A901 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
|
||||
@ -1132,13 +1133,13 @@
|
||||
323D04312489BFD80086A901 /* PreferencesWindowController.swift */,
|
||||
32B18435233F10BC00DBB4AB /* Shaders.metal */,
|
||||
32C4532D233345420000EBA1 /* MonitorView.swift */,
|
||||
3268B96F27DBD219003FBDCC /* convert_spkr_buf_to_wav.py */,
|
||||
32544194264A6C1600B7E3ED /* DisplayView.swift */,
|
||||
32C453072331C0910000EBA1 /* NSLayoutManager-Extension.swift */,
|
||||
32440BA22480D5C0000F9DA1 /* LoRes.swift */,
|
||||
32DBF7632334657900DD50E7 /* HiRes.swift */,
|
||||
32EDB7A123272CA80073AF2D /* fail1.txt */,
|
||||
32BFFB6022EACC660003B53F /* Main.storyboard */,
|
||||
321D9BDB287373000036E22F /* Main_copy.storyboard */,
|
||||
323D042D248980600086A901 /* Preferences.storyboard */,
|
||||
32C45305232E3EEF0000EBA1 /* RepeatingTimer.swift */,
|
||||
32BFFB6322EACC660003B53F /* Info.plist */,
|
||||
@ -1149,6 +1150,7 @@
|
||||
32E3126C24AC033A00E61891 /* ToolBarController.swift */,
|
||||
3267641724BCC9A5000BEA11 /* COPYING */,
|
||||
3277D7A2273C603600749544 /* DisplayScrollView.swift */,
|
||||
3268B96F27DBD219003FBDCC /* convert_spkr_buf_to_wav.py */,
|
||||
);
|
||||
path = A2Mac;
|
||||
sourceTree = "<group>";
|
||||
@ -1479,11 +1481,11 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
321D9C3B287373D20036E22F /* Main.storyboard in Resources */,
|
||||
32BCCD1A2650D3B1002151C5 /* Debug-Info.plist in Resources */,
|
||||
32799F8D264B1A5700255669 /* COPYING in Resources */,
|
||||
32799F8F264B1A5700255669 /* Assets.xcassets in Resources */,
|
||||
3268B99227DEAC84003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom in Resources */,
|
||||
3277D783273AE0DC00749544 /* Main.storyboard in Resources */,
|
||||
32799F90264B1A5700255669 /* Preferences.storyboard in Resources */,
|
||||
32799F91264B1A5700255669 /* Steve2Icon.icns in Resources */,
|
||||
);
|
||||
@ -1493,11 +1495,11 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
321D9C45287373D30036E22F /* Main.storyboard in Resources */,
|
||||
32BCCD192650D3B1002151C5 /* Debug-Info.plist in Resources */,
|
||||
3267641824BCC9A5000BEA11 /* COPYING in Resources */,
|
||||
32BFFB5F22EACC660003B53F /* Assets.xcassets in Resources */,
|
||||
3268B99127DEAC84003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom in Resources */,
|
||||
3277D779273AE0DA00749544 /* Main.storyboard in Resources */,
|
||||
323D042E248980600086A901 /* Preferences.storyboard in Resources */,
|
||||
320F2A8824CFD74100671B35 /* Steve2Icon.icns in Resources */,
|
||||
);
|
||||
@ -1712,6 +1714,14 @@
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
321D9BDB287373000036E22F /* Main_copy.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
321D9BDC287373000036E22F /* Base */,
|
||||
);
|
||||
name = Main_copy.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
325EB64823FBBACF00C6B4A4 /* Main.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
|
||||
139185
A2Mac/A2Mac/Base.lproj/Main_copy.storyboard
Normal file
139185
A2Mac/A2Mac/Base.lproj/Main_copy.storyboard
Normal file
File diff suppressed because it is too large
Load Diff
@ -1698,11 +1698,11 @@
|
||||
<objects>
|
||||
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="Steve___" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" identifier="Monitor View" wantsLayer="YES" focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="m2S-Jp-Qdl" customClass="MonitorView" customModule="Steve___" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="1288" height="800"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1288" height="768"/>
|
||||
<subviews>
|
||||
<textField identifier="Display Background" focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" mirrorLayoutDirectionWhenInternationalizing="never" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIF-Q5-Onc">
|
||||
<rect key="frame" x="0.0" y="0.0" width="1152" height="800"/>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" enabled="NO" refusesFirstResponder="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" focusRingType="none" baseWritingDirection="leftToRight" drawsBackground="YES" id="cIa-Sd-4OZ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="1152" height="768"/>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" enabled="NO" refusesFirstResponder="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" focusRingType="none" baseWritingDirection="leftToRight" title="Background" drawsBackground="YES" id="cIa-Sd-4OZ">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" red="0.078431372549019607" green="0.10980392156862745" blue="0.078431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="backgroundColor" red="0.078431372549019607" green="0.10980392156862745" blue="0.078431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1711,18 +1711,27 @@
|
||||
</allowedInputSourceLocales>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YFr-hv-M4w">
|
||||
<rect key="frame" x="-7" y="0.0" width="1161" height="768"/>
|
||||
<textFieldCell key="cell" selectable="YES" id="KMP-KW-eVW">
|
||||
<font key="font" size="32" name="PrintChar21"/>
|
||||
<string key="title">01234567890123456789012345678901234567891@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@2@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@3@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@4@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@5@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@7@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@9@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@10@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@11@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@12@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@13@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@14@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@15@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@16@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@17@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@18@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@19@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@20@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@21@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@22@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@23@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@</string>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<scrollView hidden="YES" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" borderType="none" horizontalLineScroll="0.0" horizontalPageScroll="0.0" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" hasVerticalScroller="NO" minMagnification="1" translatesAutoresizingMaskIntoConstraints="NO" id="ss1-M1-nGn" userLabel="Scroll View - Display View" customClass="DisplayScrollView" customModule="Steve___" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="768"/>
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="736"/>
|
||||
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="1wa-ZE-lex">
|
||||
<rect key="frame" x="0.0" y="0.0" width="1152" height="768"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1152" height="736"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="ccC-Wu-3za" userLabel="Display" customClass="DisplayView" customModule="Steve___" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="267" width="1152" height="768"/>
|
||||
<rect key="frame" x="0.0" y="256" width="1152" height="768"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.99143940210000003" blue="1" alpha="0.76658818490000002" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<size key="minSize" width="1152" height="768"/>
|
||||
<size key="minSize" width="1152" height="736"/>
|
||||
<size key="maxSize" width="3840" height="58101"/>
|
||||
<attributedString key="textStorage">
|
||||
<fragment>
|
||||
@ -1752,24 +1761,24 @@
|
||||
</scroller>
|
||||
</scrollView>
|
||||
<customView hidden="YES" focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Gqh-qw-fjy" userLabel="LoRes" customClass="LoRes" customModule="Steve___" customModuleProvider="target">
|
||||
<rect key="frame" x="5" y="16" width="1142" height="768"/>
|
||||
<rect key="frame" x="5" y="16" width="1142" height="736"/>
|
||||
</customView>
|
||||
<customView hidden="YES" focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="LlM-EV-ruZ" userLabel="HiRes" customClass="HiRes" customModule="Steve___" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="768"/>
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="736"/>
|
||||
</customView>
|
||||
<imageView hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dGn-a4-c1t" userLabel="ScanLines">
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="768"/>
|
||||
<rect key="frame" x="0.0" y="16" width="1152" height="736"/>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" focusRingType="none" alignment="left" imageScaling="axesIndependently" image="scanlines" id="jJ6-qt-oZe"/>
|
||||
</imageView>
|
||||
<imageView hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" alphaValue="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="Ghs-c1-ZkA" userLabel="DotmatrixEffect">
|
||||
<rect key="frame" x="5" y="16" width="1142" height="768"/>
|
||||
<rect key="frame" x="5" y="16" width="1142" height="736"/>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" focusRingType="none" alignment="left" imageScaling="axesIndependently" image="dotmatrix_effect" id="nPr-Un-zjz"/>
|
||||
</imageView>
|
||||
<customView focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="D0w-YC-YlJ" userLabel="Splash Screen">
|
||||
<rect key="frame" x="5" y="16" width="1142" height="768"/>
|
||||
<rect key="frame" x="5" y="16" width="1142" height="736"/>
|
||||
<subviews>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9jr-eX-yOC">
|
||||
<rect key="frame" x="14" y="711" width="291" height="41"/>
|
||||
<rect key="frame" x="14" y="679" width="291" height="41"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" title="Steve ][" id="Uco-5h-Aii">
|
||||
<font key="font" size="41" name="PrintChar21"/>
|
||||
<color key="textColor" red="0.18823529411764706" green="0.83529411764705885" blue="0.84705882352941175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1777,7 +1786,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19A-Bc-mjX">
|
||||
<rect key="frame" x="16" y="680" width="287" height="19"/>
|
||||
<rect key="frame" x="16" y="648" width="287" height="19"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" title="Apple ][ Emulator" id="3va-2j-fR7">
|
||||
<font key="font" size="19" name="PrintChar21"/>
|
||||
<color key="textColor" red="0.18823529411764706" green="0.83529411764705885" blue="0.84705882352941175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1785,7 +1794,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uMO-wh-lu4" userLabel="Jobs">
|
||||
<rect key="frame" x="16" y="627" width="235" height="13"/>
|
||||
<rect key="frame" x="16" y="595" width="235" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" title="In memoriam Steve Jobs" id="LAy-jD-fLj">
|
||||
<font key="font" size="12" name="PrintChar21"/>
|
||||
<color key="textColor" red="0.18823529411764706" green="0.83529411764705885" blue="0.84705882352941175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1793,7 +1802,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WWG-zg-Mnb" userLabel="Wozniak">
|
||||
<rect key="frame" x="16" y="606" width="235" height="13"/>
|
||||
<rect key="frame" x="16" y="574" width="235" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" title="Honoring Steve Wozniak" id="5G1-y6-wdu">
|
||||
<font key="font" size="12" name="PrintChar21"/>
|
||||
<color key="textColor" red="0.18823529411764706" green="0.83529411764705885" blue="0.84705882352941175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1801,7 +1810,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w41-S5-cTL" userLabel="Prompt">
|
||||
<rect key="frame" x="16" y="553" width="25" height="13"/>
|
||||
<rect key="frame" x="16" y="521" width="25" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" title="]" id="CYs-wL-6Pf">
|
||||
<font key="font" size="12" name="PrintChar21"/>
|
||||
<color key="textColor" red="0.18823529411764706" green="0.83529411764705885" blue="0.84705882352941175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
@ -1817,7 +1826,7 @@
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<imageView focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="M1E-lz-4q8" userLabel="Splash Logo">
|
||||
<rect key="frame" x="425" y="199" width="384" height="308"/>
|
||||
<rect key="frame" x="425" y="185" width="384" height="308"/>
|
||||
<imageCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" focusRingType="none" alignment="left" imageScaling="proportionallyUpOrDown" image="imageCell:Zax-kI-rxd:image" id="Zax-kI-rxd"/>
|
||||
</imageView>
|
||||
</subviews>
|
||||
@ -1847,10 +1856,10 @@
|
||||
</constraints>
|
||||
</customView>
|
||||
<customView identifier="Side Panel" focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="Fdf-pv-iEw" userLabel="Side Panel">
|
||||
<rect key="frame" x="1160" y="8" width="120" height="784"/>
|
||||
<rect key="frame" x="1160" y="8" width="120" height="752"/>
|
||||
<subviews>
|
||||
<stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="-20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5gO-h7-NcU" userLabel="Prefipheries">
|
||||
<rect key="frame" x="0.0" y="598" width="120" height="186"/>
|
||||
<rect key="frame" x="0.0" y="566" width="120" height="186"/>
|
||||
<subviews>
|
||||
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="49f-8R-QCc">
|
||||
<rect key="frame" x="0.0" y="83" width="120" height="103"/>
|
||||
@ -2138,6 +2147,8 @@
|
||||
<constraint firstItem="D0w-YC-YlJ" firstAttribute="top" secondItem="ss1-M1-nGn" secondAttribute="top" id="8bz-WZ-Szj"/>
|
||||
<constraint firstItem="dGn-a4-c1t" firstAttribute="top" secondItem="ss1-M1-nGn" secondAttribute="top" id="8g8-nm-CxE"/>
|
||||
<constraint firstItem="ss1-M1-nGn" firstAttribute="trailing" secondItem="iIF-Q5-Onc" secondAttribute="trailing" identifier="Display Margin Trailing" id="AYX-tI-fE9"/>
|
||||
<constraint firstItem="YFr-hv-M4w" firstAttribute="bottom" secondItem="iIF-Q5-Onc" secondAttribute="bottom" id="DEy-CP-T95"/>
|
||||
<constraint firstItem="YFr-hv-M4w" firstAttribute="trailing" secondItem="iIF-Q5-Onc" secondAttribute="trailing" id="DH9-rb-bUZ"/>
|
||||
<constraint firstItem="Ghs-c1-ZkA" firstAttribute="bottom" secondItem="ss1-M1-nGn" secondAttribute="bottom" id="DgS-2W-eVa"/>
|
||||
<constraint firstItem="dGn-a4-c1t" firstAttribute="bottom" secondItem="ss1-M1-nGn" secondAttribute="bottom" id="EBM-Pm-MJ8"/>
|
||||
<constraint firstItem="Gqh-qw-fjy" firstAttribute="top" secondItem="ss1-M1-nGn" secondAttribute="top" id="FF5-Ke-cOk"/>
|
||||
@ -2149,6 +2160,7 @@
|
||||
<constraint firstItem="Gqh-qw-fjy" firstAttribute="bottom" secondItem="ss1-M1-nGn" secondAttribute="bottom" id="NJ1-qp-iku"/>
|
||||
<constraint firstItem="ss1-M1-nGn" firstAttribute="leading" secondItem="iIF-Q5-Onc" secondAttribute="leading" identifier="Display Margin Leading" id="QGx-a9-RR9"/>
|
||||
<constraint firstItem="D0w-YC-YlJ" firstAttribute="leading" secondItem="ss1-M1-nGn" secondAttribute="leading" constant="5" id="SVU-d6-DH1"/>
|
||||
<constraint firstItem="YFr-hv-M4w" firstAttribute="leading" secondItem="iIF-Q5-Onc" secondAttribute="leading" constant="-5" id="Ulp-f9-nhz"/>
|
||||
<constraint firstItem="Fdf-pv-iEw" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="8" id="Umg-3A-zmv"/>
|
||||
<constraint firstItem="Gqh-qw-fjy" firstAttribute="leading" secondItem="ss1-M1-nGn" secondAttribute="leading" constant="5" id="VcW-Wh-wiF"/>
|
||||
<constraint firstItem="ss1-M1-nGn" firstAttribute="top" secondItem="iIF-Q5-Onc" secondAttribute="top" constant="16" identifier="Display Margin Top" id="VdT-jM-SRU"/>
|
||||
@ -2160,13 +2172,13 @@
|
||||
<constraint firstItem="LlM-EV-ruZ" firstAttribute="bottom" secondItem="ss1-M1-nGn" secondAttribute="bottom" id="ltj-Ea-Vtb"/>
|
||||
<constraint firstItem="iIF-Q5-Onc" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" identifier="Display Background Top" id="m3e-ww-N7S"/>
|
||||
<constraint firstItem="LlM-EV-ruZ" firstAttribute="trailing" secondItem="ss1-M1-nGn" secondAttribute="trailing" id="nAy-xD-Y3s"/>
|
||||
<constraint firstItem="YFr-hv-M4w" firstAttribute="top" secondItem="iIF-Q5-Onc" secondAttribute="top" id="nEu-FX-hDf"/>
|
||||
<constraint firstItem="D0w-YC-YlJ" firstAttribute="bottom" secondItem="ss1-M1-nGn" secondAttribute="bottom" id="qTc-wn-Sqn"/>
|
||||
<constraint firstItem="dGn-a4-c1t" firstAttribute="leading" secondItem="ss1-M1-nGn" secondAttribute="leading" id="xqX-cb-8Hz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Fdf-pv-iEw" secondAttribute="trailing" constant="8" id="yy6-NU-JJX"/>
|
||||
<constraint firstItem="LlM-EV-ruZ" firstAttribute="leading" secondItem="ss1-M1-nGn" secondAttribute="leading" id="zkY-0O-xcA"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<outlet property="clipView" destination="1wa-ZE-lex" id="MHH-OC-OYI"/>
|
||||
<outlet property="scanlinesView" destination="dGn-a4-c1t" id="eqJ-YB-9cU"/>
|
||||
<outlet property="textDisplay" destination="ccC-Wu-3za" id="PB1-X7-azr"/>
|
||||
</connections>
|
||||
|
||||
@ -18,6 +18,15 @@ class DisplayView: NSTextView {
|
||||
|
||||
var trackingArea: NSTrackingArea?
|
||||
|
||||
func debugDisplayContraints() {
|
||||
print( "debugDisplayContraints ----------------------------------" )
|
||||
if let view = window?.contentView {
|
||||
for constraint in view.constraints {
|
||||
print( "debugDisplayContraints:", constraint.identifier ?? "{Constaint has no identifier}", constraint.constant )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Install tracking area if window is set, remove previous one if needed.
|
||||
func installTrackingArea() {
|
||||
guard let window = window else { return }
|
||||
@ -45,6 +54,8 @@ class DisplayView: NSTextView {
|
||||
override func mouseDown(with event: NSEvent) {
|
||||
// print(#function + "DisplayView")
|
||||
ViewController.current?.mouseDown(with: event)
|
||||
|
||||
// debugDisplayContraints()
|
||||
}
|
||||
|
||||
override func mouseUp(with event: NSEvent) {
|
||||
|
||||
@ -26,7 +26,6 @@ import Cocoa
|
||||
class MonitorView: NSView {
|
||||
|
||||
@IBOutlet var textDisplay: DisplayView!
|
||||
@IBOutlet weak var clipView: NSClipView!
|
||||
@IBOutlet weak var scanlinesView: NSImageView!
|
||||
|
||||
static let overscan_h = CGFloat(25)
|
||||
|
||||
@ -231,13 +231,17 @@ class ViewController: NSViewController {
|
||||
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||
NSAnimationContext.runAnimationGroup({ (context) in
|
||||
context.duration = 0.5
|
||||
context.duration = 1.0
|
||||
// Use the value you want to animate to (NOT the starting value)
|
||||
self.textDisplayScroller.animator().alphaValue = 1
|
||||
self.hires.animator().alphaValue = 1
|
||||
self.lores.animator().alphaValue = 1
|
||||
self.splashScreen.animator().alphaValue = 0
|
||||
},
|
||||
completionHandler:{ () -> Void in
|
||||
self.textDisplayScroller.alphaValue = 1
|
||||
self.hires.alphaValue = 1
|
||||
self.lores.alphaValue = 1
|
||||
self.splashScreen.isHidden = true
|
||||
})
|
||||
|
||||
@ -288,12 +292,39 @@ class ViewController: NSViewController {
|
||||
//------------------------------------------------------------
|
||||
// Animated Splash Screen fade out and (Text) Monitor fade in
|
||||
|
||||
hires.isHidden = true
|
||||
lores.isHidden = true
|
||||
textDisplayScroller.alphaValue = 0
|
||||
// textDisplayScroller.isHidden = false
|
||||
splashScreen.alphaValue = 1
|
||||
splashScreen.isHidden = false
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
|
||||
self.splashScreen.alphaValue = 0
|
||||
self.splashScreen.isHidden = false
|
||||
|
||||
NSAnimationContext.runAnimationGroup({ (context) in
|
||||
context.duration = 0.5
|
||||
// Use the value you want to animate to (NOT the starting value)
|
||||
self.textDisplayScroller.animator().alphaValue = 0
|
||||
self.hires.animator().alphaValue = 0
|
||||
self.lores.animator().alphaValue = 0
|
||||
self.splashScreen.animator().alphaValue = 1
|
||||
},
|
||||
completionHandler:{ () -> Void in
|
||||
self.textDisplayScroller.alphaValue = 0
|
||||
self.textDisplayScroller.isHidden = true
|
||||
self.splashScreen.isHidden = false
|
||||
|
||||
self.hires.alphaValue = 0
|
||||
self.lores.alphaValue = 0
|
||||
self.hires.isHidden = true
|
||||
self.lores.isHidden = true
|
||||
|
||||
self.splashScreen.isHidden = false
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// hires.isHidden = true
|
||||
// lores.isHidden = true
|
||||
// textDisplayScroller.alphaValue = 0
|
||||
//// textDisplayScroller.isHidden = false
|
||||
// splashScreen.alphaValue = 1
|
||||
// splashScreen.isHidden = false
|
||||
|
||||
//------------------------------------------------------------
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user