Merge branch 'release-1.5.9'

Core/Source/DTLoupeView.m

@@ -134,7 +134,7 @@ - (id)init
 
 		// maks for the loupe contents layer
 		_loupeContentsMaskLayer = [CALayer layer];
-		_loupeContentsMaskLayer.transform = CATransform3DMakeScale(1.0f, -1.0f, 1.0f);
+		_loupeContentsMaskLayer.transform = CATransform3DMakeScale(1.0f, 1.0f, 1.0f); // RWM
 		_loupeContentsMaskLayer.contentsScale = scale;
 
 		// layer with contents of the loupe
@@ -197,7 +197,7 @@ + (CGPoint)offsetFromCenterForLoupeStyle:(DTLoupeStyle)style
 	switch (style)
 	{
 		case DTLoupeStyleCircle:
-			return CGPointMake(0, -60.0);
+			return CGPointMake(0, -64.0);
 
 		case DTLoupeStyleRectangle:
 			return CGPointMake(0, -30.0);
@@ -216,7 +216,7 @@ + (CGPoint)magnifiedImageOffsetForStyle:(DTLoupeStyle)style
 	{
 		case DTLoupeStyleCircle:
 		{
-			return CGPointMake(0, -4.0);
+			return CGPointMake(0, 0.0);
 		}
 		case DTLoupeStyleRectangle:
 		{

DTLoupe.xcodeproj/project.pbxproj

@@ -25,7 +25,14 @@
 		0F01D89313B248CB00419BD7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F01D89213B248CB00419BD7 /* Foundation.framework */; };
 		0F01D89513B248CB00419BD7 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F01D89413B248CB00419BD7 /* CoreGraphics.framework */; };
 		0F01D8C613B24BC300419BD7 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F01D8C513B24BC300419BD7 /* QuartzCore.framework */; };
-		A7084DF5183E144400C22622 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A7084DF4183E144400C22622 /* [email protected] */; };
+		1DDADF7D1D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF761D071C570026D504 /* [email protected] */; };
+		1DDADF7E1D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF771D071C570026D504 /* [email protected] */; };
+		1DDADF7F1D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF781D071C570026D504 /* [email protected] */; };
+		1DDADF801D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF791D071C570026D504 /* [email protected] */; };
+		1DDADF811D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF7A1D071C570026D504 /* [email protected] */; };
+		1DDADF821D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF7B1D071C570026D504 /* [email protected] */; };
+		1DDADF831D071C570026D504 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF7C1D071C570026D504 /* [email protected] */; };
+		1DDADF861D071CBD0026D504 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1DDADF841D071CA70026D504 /* Launch Screen.storyboard */; };
 		A7D3C869184F1E0F00D8CA62 /* DTLoupeLayerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 87C3121E184AE83E00442A2F /* DTLoupeLayerDelegate.m */; };
 		A7D8FEDE14E1690600BF8CCD /* AppleLoupeController.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8FEDB14E1690600BF8CCD /* AppleLoupeController.m */; };
 		A7D8FEDF14E1690600BF8CCD /* LoupeDemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8FEDD14E1690600BF8CCD /* LoupeDemoAppDelegate.m */; };
@@ -80,13 +87,20 @@
 		0F01D89213B248CB00419BD7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		0F01D89413B248CB00419BD7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		0F01D8C513B24BC300419BD7 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		1DDADF761D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF771D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF781D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF791D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF7A1D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF7B1D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF7C1D071C570026D504 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1DDADF841D071CA70026D504 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		87C3121D184AE83E00442A2F /* DTLoupeLayerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTLoupeLayerDelegate.h; sourceTree = "<group>"; };
 		87C3121E184AE83E00442A2F /* DTLoupeLayerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTLoupeLayerDelegate.m; sourceTree = "<group>"; };
 		A70752471803F8E30045F3F1 /* Change Log-template.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Change Log-template.markdown"; sourceTree = "<group>"; };
 		A70752481803FAD60045F3F1 /* AppledocSettings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AppledocSettings.plist; sourceTree = SOURCE_ROOT; };
 		A70752491803FAD60045F3F1 /* DTLoupe.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DTLoupe.podspec; sourceTree = SOURCE_ROOT; };
 		A707524A1803FAD60045F3F1 /* Readme.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.markdown; sourceTree = SOURCE_ROOT; };
-		A7084DF4183E144400C22622 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		A7D8FEDA14E1690600BF8CCD /* AppleLoupeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppleLoupeController.h; sourceTree = "<group>"; };
 		A7D8FEDB14E1690600BF8CCD /* AppleLoupeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppleLoupeController.m; sourceTree = "<group>"; };
 		A7D8FEDC14E1690600BF8CCD /* LoupeDemoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoupeDemoAppDelegate.h; sourceTree = "<group>"; };
@@ -214,18 +228,25 @@
 				A7D8FEFF14E169C100BF8CCD /* [email protected] */,
 				A7D8FF0014E169C100BF8CCD /* kb-loupe-hi.png */,
 				A7D8FF0114E169C100BF8CCD /* [email protected] */,
+				1DDADF761D071C570026D504 /* [email protected] */,
 				A7D8FF0214E169C100BF8CCD /* kb-loupe-lo.png */,
 				A7D8FF0314E169C100BF8CCD /* [email protected] */,
+				1DDADF771D071C570026D504 /* [email protected] */,
 				A7D8FF0414E169C100BF8CCD /* kb-loupe-mask.png */,
 				A7D8FF0514E169C100BF8CCD /* [email protected] */,
+				1DDADF781D071C570026D504 /* [email protected] */,
 				A7D8FF0614E169C100BF8CCD /* kb-magnifier-ranged-hi.png */,
 				A7D8FF0714E169C100BF8CCD /* [email protected] */,
+				1DDADF791D071C570026D504 /* [email protected] */,
 				A7D8FF0814E169C100BF8CCD /* kb-magnifier-ranged-lo-stemless.png */,
 				A7D8FF0914E169C100BF8CCD /* [email protected] */,
+				1DDADF7A1D071C570026D504 /* [email protected] */,
 				A7D8FF0A14E169C100BF8CCD /* kb-magnifier-ranged-lo.png */,
 				A7D8FF0B14E169C100BF8CCD /* [email protected] */,
+				1DDADF7B1D071C570026D504 /* [email protected] */,
 				A7D8FF0C14E169C100BF8CCD /* kb-magnifier-ranged-mask.png */,
 				A7D8FF0D14E169C100BF8CCD /* [email protected] */,
+				1DDADF7C1D071C570026D504 /* [email protected] */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -255,7 +276,7 @@
 		A7D8FED814E1690600BF8CCD /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				A7084DF4183E144400C22622 /* [email protected] */,
+				1DDADF841D071CA70026D504 /* Launch Screen.storyboard */,
 				A7D8FF1F14E16A9000BF8CCD /* Loupe-hi-thumb.png */,
 				A7D8FF2014E16A9000BF8CCD /* [email protected] */,
 				A7D8FF2114E16A9000BF8CCD /* Magnifier-thumb.png */,
@@ -404,14 +425,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				A7D8FF7A14E17B2100BF8CCD /* DTLoupe.bundle in Resources */,
-				A7084DF5183E144400C22622 /* [email protected] in Resources */,
 				A7D8FEFB14E1699F00BF8CCD /* AppleLoupeView.xib in Resources */,
 				A7D8FEFC14E1699F00BF8CCD /* LoupeView.xib in Resources */,
 				A7D8FEFD14E1699F00BF8CCD /* MainWindow.xib in Resources */,
 				A7D8FF1E14E16A7E00BF8CCD /* LittleB.JPG in Resources */,
 				A7D8FF2314E16A9000BF8CCD /* Loupe-hi-thumb.png in Resources */,
 				A7D8FF2414E16A9000BF8CCD /* [email protected] in Resources */,
 				A7D8FF2514E16A9000BF8CCD /* Magnifier-thumb.png in Resources */,
+				1DDADF861D071CBD0026D504 /* Launch Screen.storyboard in Resources */,
 				A7D8FF2614E16A9000BF8CCD /* [email protected] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -420,18 +441,25 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1DDADF7F1D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF6714E17A8600BF8CCD /* kb-drag-dot.png in Resources */,
 				A7D8FF6814E17A8600BF8CCD /* [email protected] in Resources */,
+				1DDADF801D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF6914E17A8600BF8CCD /* kb-loupe-hi.png in Resources */,
 				A7D8FF6A14E17A8600BF8CCD /* [email protected] in Resources */,
+				1DDADF831D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF6B14E17A8600BF8CCD /* kb-loupe-lo.png in Resources */,
 				A7D8FF6C14E17A8600BF8CCD /* [email protected] in Resources */,
 				A7D8FF6D14E17A8600BF8CCD /* kb-loupe-mask.png in Resources */,
+				1DDADF7E1D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF6E14E17A8600BF8CCD /* [email protected] in Resources */,
 				A7D8FF6F14E17A8600BF8CCD /* kb-magnifier-ranged-hi.png in Resources */,
+				1DDADF811D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF7014E17A8600BF8CCD /* [email protected] in Resources */,
+				1DDADF7D1D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF7114E17A8600BF8CCD /* kb-magnifier-ranged-lo-stemless.png in Resources */,
 				A7D8FF7214E17A8600BF8CCD /* [email protected] in Resources */,
+				1DDADF821D071C570026D504 /* [email protected] in Resources */,
 				A7D8FF7314E17A8600BF8CCD /* kb-magnifier-ranged-lo.png in Resources */,
 				A7D8FF7414E17A8600BF8CCD /* [email protected] in Resources */,
 				A7D8FF7514E17A8600BF8CCD /* kb-magnifier-ranged-mask.png in Resources */,

Demo/Demo-Info.plist

@@ -28,6 +28,8 @@
 	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainWindow</string>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch Screen</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Demo/Resources/Launch Screen.storyboard

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2016 cocoanetics.com. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="20" y="559" width="560" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DTLoupe" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="20" y="180" width="560" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>