Skip to content

Commit

Permalink
Removed Second Box Until It's implemented
Browse files Browse the repository at this point in the history 
I think this should be implemented as an optional. Default is the
standard way
  • Loading branch information
@kennethshawfriedman
kennethshawfriedman committed May 8, 2017
1 parent dce8e68 commit 410bd4c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 38 deletions.
Binary file modified ...xcodeproj/project.xcworkspace/xcuserdata/Kenny.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
43 changes: 6 additions & 37 deletions Schemer-MacOS/Schemer/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,16 +571,16 @@ DQ
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView wantsLayer="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7A-dN-7m3">
<rect key="frame" x="20" y="20" width="210" height="230"/>
<rect key="frame" x="20" y="20" width="440" height="230"/>
<clipView key="contentView" id="3lk-Qd-DqB">
<rect key="frame" x="1" y="1" width="208" height="228"/>
<rect key="frame" x="1" y="1" width="438" height="228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView importsGraphics="NO" usesFontPanel="YES" findStyle="panel" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" id="2ZQ-j0-c0d">
<rect key="frame" x="0.0" y="-0.5" width="208" height="228"/>
<rect key="frame" x="0.0" y="-0.5" width="438" height="228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="208" height="228"/>
<size key="minSize" width="438" height="228"/>
<size key="maxSize" width="463" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</textView>
Expand All @@ -592,51 +592,20 @@ DQ
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="1lA-lQ-tTS">
<rect key="frame" x="193" y="1" width="16" height="228"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jem-5m-gmm">
<rect key="frame" x="238" y="20" width="222" height="230"/>
<clipView key="contentView" id="AqN-c6-bVi">
<rect key="frame" x="1" y="1" width="220" height="228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView importsGraphics="NO" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="P6k-Sf-RhI">
<rect key="frame" x="0.0" y="0.0" width="220" height="228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="220" height="228"/>
<size key="maxSize" width="463" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</textView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="yeI-UM-cHd">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Zx5-5k-FJ6">
<rect key="frame" x="205" y="1" width="16" height="228"/>
<rect key="frame" x="423" y="1" width="16" height="228"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="jem-5m-gmm" secondAttribute="bottom" constant="20" id="Bw1-d1-VZn"/>
<constraint firstItem="jem-5m-gmm" firstAttribute="leading" secondItem="1lA-lQ-tTS" secondAttribute="trailing" constant="9" id="DBn-Ev-za3"/>
<constraint firstItem="i7A-dN-7m3" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="20" id="DID-gf-wyp"/>
<constraint firstAttribute="bottom" secondItem="i7A-dN-7m3" secondAttribute="bottom" constant="20" id="GhX-BK-BqS"/>
<constraint firstAttribute="trailing" secondItem="jem-5m-gmm" secondAttribute="trailing" constant="20" id="JG0-1z-Wt1"/>
<constraint firstItem="jem-5m-gmm" firstAttribute="width" secondItem="2ZQ-j0-c0d" secondAttribute="width" id="Kmy-s9-2MZ"/>
<constraint firstItem="jem-5m-gmm" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="20" id="ML8-07-cdB"/>
<constraint firstItem="i7A-dN-7m3" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="20" id="N0F-1M-KCW"/>
<constraint firstAttribute="trailing" secondItem="i7A-dN-7m3" secondAttribute="trailing" constant="20" id="fhj-gy-df9"/>
</constraints>
</view>
<connections>
<outlet property="cf" destination="2ZQ-j0-c0d" id="gQG-0F-Pwn"/>
<outlet property="outField" destination="jem-5m-gmm" id="reX-Pb-hHg"/>
<outlet property="scrollView" destination="i7A-dN-7m3" id="FlH-GE-V2b"/>
</connections>
</viewController>
Expand Down
2 changes: 1 addition & 1 deletion Schemer-MacOS/Schemer/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ViewController: NSViewController {
//Class Variables
////InterfaceBuilder Connected
@IBOutlet var cf: CodeField!
@IBOutlet var outField: CodeField!
//@IBOutlet var outField: CodeField!
@IBOutlet var scrollView: NSScrollView!
//non-UI
let task = SchemeProcess.shared
Expand Down

0 comments on commit 410bd4c

Please sign in to comment.