Skip to content

Commit

Permalink
Updated to version 1.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicklockwood
nicklockwood committed Sep 22, 2012
1 parent e78d799 commit 1cbd441
Show file tree
Hide file tree
Showing 18 changed files with 88 additions and 53 deletions.
8 changes: 7 additions & 1 deletion Examples/Label Styles/FXLabelExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
01924544160E11CE005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924543160E11CE005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
Expand All @@ -20,6 +21,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
01924543160E11CE005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
01924543160E11CE005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
Expand Down Expand Up @@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0440;
LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
01924544160E11CE005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -265,6 +269,7 @@
GCC_PREFIX_HEADER = "FXLabelExample/FXLabelExample-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "FXLabelExample/FXLabelExample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand All @@ -277,6 +282,7 @@
GCC_PREFIX_HEADER = "FXLabelExample/FXLabelExample-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "FXLabelExample/FXLabelExample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand Down
Binary file added Examples/Label Styles/FXLabelExample/Default-568h@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 15 additions & 14 deletions Examples/Label Styles/FXLabelExample/en.lproj/FXLabelExampleViewController.xib
View file
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
<string key="NS.object.0">1926</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
<string>IBUIView</string>
<string>IBUILabel</string>
<string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -45,7 +45,7 @@
<string key="NSFrame">{{20, 30}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="370874756"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
Expand Down Expand Up @@ -116,7 +116,7 @@
<string key="NSFrame">{{20, 184}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="419998994"/>
<reference key="NSNextKeyView" ref="68980804"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
Expand Down Expand Up @@ -148,6 +148,7 @@
<string key="NSFrame">{{20, 273}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="419998994"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
Expand Down Expand Up @@ -336,7 +337,7 @@
<string>8.CustomClassName</string>
<string>8.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>FXLabelExampleViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
Expand Down Expand Up @@ -367,7 +368,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">18</int>
<int key="maxID">20</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand All @@ -393,7 +394,7 @@
<string>label4</string>
<string>label5</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>FXLabel</string>
<string>FXLabel</string>
Expand All @@ -412,7 +413,7 @@
<string>label4</string>
<string>label5</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">label1</string>
Expand Down Expand Up @@ -451,6 +452,6 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">933</string>
<string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>
6 changes: 5 additions & 1 deletion Examples/Oversampling/FXLabelExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0192454D160E3CBA005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0192454C160E3CBA005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
Expand All @@ -20,6 +21,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0192454C160E3CBA005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
0192454C160E3CBA005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
Expand Down Expand Up @@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
0192454D160E3CBA005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added Examples/Oversampling/FXLabelExample/Default-568h@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Examples/Text Alignment/FXLabelExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
01924553160E3D45005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924552160E3D45005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
Expand All @@ -20,6 +21,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
01924552160E3D45005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
01924552160E3D45005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
Expand Down Expand Up @@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
01924553160E3D45005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added Examples/Text Alignment/FXLabelExample/Default-568h@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Examples/Text Insets/FXLabelExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0192455B160E3D90005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0192455A160E3D90005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
Expand All @@ -20,6 +21,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0192455A160E3D90005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
0192455A160E3D90005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
Expand Down Expand Up @@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
0192455B160E3D90005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added Examples/Text Insets/FXLabelExample/Default-568h@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 10 additions & 15 deletions FXLabel/FXLabel.h
View file
@@ -1,7 +1,7 @@
//
// FXLabel.h
//
// Version 1.3.4
// Version 1.3.5
//
// Created by Nick Lockwood on 20/08/2011.
// Copyright 2011 Charcoal Design
Expand Down Expand Up @@ -34,7 +34,7 @@
//
// ARC Helper
//
// Version 1.3
// Version 2.1
//
// Created by Nick Lockwood on 05/01/2012.
// Copyright 2012 Charcoal Design
Expand All @@ -45,21 +45,16 @@
// https://gist.github.com/1563325
//

#ifndef AH_RETAIN
#ifndef ah_retain
#if __has_feature(objc_arc)
#define AH_RETAIN(x) (x)
#define AH_RELEASE(x) (void)(x)
#define AH_AUTORELEASE(x) (x)
#define AH_SUPER_DEALLOC (void)(0)
#define __AH_BRIDGE __bridge
#define ah_retain self
#define ah_dealloc self
#define release self
#define autorelease self
#else
#define __AH_WEAK
#define AH_WEAK assign
#define AH_RETAIN(x) [(x) retain]
#define AH_RELEASE(x) [(x) release]
#define AH_AUTORELEASE(x) [(x) autorelease]
#define AH_SUPER_DEALLOC [super dealloc]
#define __AH_BRIDGE
#define ah_retain retain
#define ah_dealloc dealloc
#define __bridge
#endif
#endif

Expand Down

0 comments on commit 1cbd441

Please sign in to comment.