Merge remote-tracking branch 'galaxas0/upstream' (pull request github#85

)
Milracle · Oct 1, 2012 · 638c596 · 638c596
2 parents 33e3fde + 2fe3834
commit 638c596
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 171 deletions.
diff --git a/ExampleProject/Example/main.m b/ExampleProject/Example/main.m
@@ -24,13 +24,5 @@
 
 int main(int argc, char *argv[])
 {
-	SInt32 major = 0;
-	SInt32 minor = 0;
-	Gestalt(gestaltSystemVersionMajor, &major);
-	Gestalt(gestaltSystemVersionMinor, &minor);
-	if((major == 10 && minor >= 7) || major >= 11) {
-		AtLeastLion = YES;
-	}
-
 	return NSApplicationMain(argc, (const char **)argv);
 }
diff --git a/TwUI.xcodeproj/project.pbxproj b/TwUI.xcodeproj/project.pbxproj
diff --git a/lib/UIKit/TUIKit.h b/lib/UIKit/TUIKit.h
@@ -44,7 +44,6 @@
 #import "TUIScrollView+TUIBridgedScrollView.h"
 #import "TUIStretchableImage.h"
 #import "TUIStringDrawing.h"
-#import "TUIStyledView.h"
 #import "TUITableView+Additions.h"
 #import "TUITableView.h"
 #import "TUITableViewCell.h"
@@ -58,5 +57,3 @@
 #import "TUIViewController.h"
 #import "TUIViewNSViewContainer.h"
 #import "NSFont+TUIExtensions.h"
-
-extern BOOL AtLeastLion; // set at launch
diff --git a/lib/UIKit/TUIKit.m b/lib/UIKit/TUIKit.m
diff --git a/lib/UIKit/TUILayoutManager.h b/lib/UIKit/TUILayoutManager.h
@@ -45,6 +45,7 @@
  
  */
 - (void)addLayoutConstraint:(TUILayoutConstraint *)constraint toView:(TUIView *)view;
+- (void)removeLayoutConstraint:(TUILayoutConstraint *)constraint fromView:(TUIView *)view;
 - (void)removeLayoutConstraintsFromView:(TUIView *)view;
 
 - (NSArray *)layoutConstraintsOnView:(TUIView *)view;

diff --git a/lib/UIKit/TUILayoutManager.m b/lib/UIKit/TUILayoutManager.m
@@ -165,6 +165,16 @@ - (void)addLayoutConstraint:(TUILayoutConstraint *)constraint toView:(TUIView *)
 	[self beginProcessingView:view];
 }
 
+- (void)removeLayoutConstraint:(TUILayoutConstraint *)constraint fromView:(TUIView *)view {
+	TUILayoutContainer *viewContainer = [self.constraints objectForKey:view];
+	if(viewContainer == nil) {
+		return;
+	}
+
+	[[viewContainer layoutConstraints] removeObject:constraint];
+	[self beginProcessingView:view];
+}
+
 - (void)removeLayoutConstraintsFromView:(TUIView *)view {
 	TUILayoutContainer *viewContainer = [self.constraints objectForKey:view];
 	[[viewContainer layoutConstraints] removeAllObjects];

diff --git a/lib/UIKit/TUINSView.h b/lib/UIKit/TUINSView.h
@@ -60,8 +60,6 @@
 - (BOOL)isHoveringSubviewOfView:(TUIView *)v; // v or subview of v
 - (BOOL)isHoveringView:(TUIView *)v; // only v
 
-- (void)ab_setIsOpaque:(BOOL)o __attribute__((deprecated)); // don't use this
-
 - (void)tui_setOpaque:(BOOL)o;
 
 - (BOOL)isWindowKey;

diff --git a/lib/UIKit/TUINSView.m b/lib/UIKit/TUINSView.m
@@ -158,11 +158,6 @@ - (void)resetCursorRects
 	f.origin = NSZeroPoint;
 	[self addCursorRect:f cursor:[NSCursor arrowCursor]];
 }
-
-- (void)ab_setIsOpaque:(BOOL)o
-{
-	opaque = o;
-}
 
 - (void)tui_setOpaque:(BOOL)o
 {

diff --git a/lib/UIKit/TUIScrollView.m b/lib/UIKit/TUIScrollView.m
@@ -14,6 +14,7 @@
  limitations under the License.
  */
 
+#import <CoreServices/CoreServices.h>
 #import "TUIScrollView.h"
 #import "TUIKit.h"
 #import "TUIScrollKnob.h"
@@ -59,6 +60,22 @@ @implementation TUIScrollView
 @synthesize decelerationRate;
 @synthesize resizeKnobSize;
 
+// Default to non-Lion behavior to prevent breakage.
+static BOOL isAtleastLion = NO;
+
++ (void)initialize {
+	if(self.class != TUIScrollView.class)
+		return;
+
+	SInt32 major = 0;
+	SInt32 minor = 0;
+
+	Gestalt(gestaltSystemVersionMajor, &major);
+	Gestalt(gestaltSystemVersionMinor, &minor);
+
+	isAtleastLion = ((major == 10 && minor >= 7) || major > 11);
+}
+
 + (Class)layerClass
 {
 	return [CAScrollLayer class];
@@ -72,7 +89,7 @@ - (id)initWithFrame:(CGRect)frame
 
 		decelerationRate = 0.88;
 
-		_scrollViewFlags.bounceEnabled = (FORCE_ENABLE_BOUNCE || AtLeastLion || [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceEnableScrollBouncing"]);
+		_scrollViewFlags.bounceEnabled = (FORCE_ENABLE_BOUNCE || isAtleastLion || [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceEnableScrollBouncing"]);
 		_scrollViewFlags.alwaysBounceVertical = FALSE;
 		_scrollViewFlags.alwaysBounceHorizontal = FALSE;
 
@@ -332,11 +349,8 @@ - (CGPoint)_fixProposedContentOffset:(CGPoint)offset
 
 - (void)setResizeKnobSize:(CGSize)s
 {
-	if(AtLeastLion) {
-		// ignore
-	} else {
+	if(!isAtleastLion)
 		resizeKnobSize = s;
-	}
 }
 
 - (BOOL)_verticalScrollKnobNeededForContentSize:(CGSize)size {
@@ -1002,7 +1016,8 @@ - (void)endGestureWithEvent:(NSEvent *)event
 	if(_scrollViewFlags.bounceEnabled) {
 		_scrollViewFlags.gestureBegan = 0;
 		[self _startThrow];
-		if(AtLeastLion) {
+
+		if(isAtleastLion) {
 			_scrollViewFlags.ignoreNextScrollPhaseNormal_10_7 = 1;
 		}
 	}
@@ -1019,7 +1034,7 @@ - (void)scrollWheel:(NSEvent *)event
 	{
 		int phase = ScrollPhaseNormal;
 
-		if(AtLeastLion) {
+		if(isAtleastLion) {
 			SEL s = @selector(momentumPhase);
 			if([event respondsToSelector:s]) {
 				NSInteger (*imp)(id,SEL) = (NSInteger(*)(id,SEL))[event methodForSelector:s];

diff --git a/lib/UIKit/TUIStyledView.h b/lib/UIKit/TUIStyledView.h
diff --git a/lib/UIKit/TUIStyledView.m b/lib/UIKit/TUIStyledView.m
diff --git a/lib/UIKit/TUIView+Layout.h b/lib/UIKit/TUIView+Layout.h
@@ -19,6 +19,7 @@
 @property (nonatomic, copy) NSString *layoutName;
 
 - (void)addLayoutConstraint:(TUILayoutConstraint *)constraint;
+- (void)removeLayoutConstraint:(TUILayoutConstraint *)constraint;
 - (NSArray *)layoutConstraints;
 - (void)removeAllLayoutConstraints;
 

diff --git a/lib/UIKit/TUIView+Layout.m b/lib/UIKit/TUIView+Layout.m
@@ -36,6 +36,10 @@ - (void)addLayoutConstraint:(TUILayoutConstraint *)constraint {
 	[[TUILayoutManager sharedLayoutManager] addLayoutConstraint:constraint toView:self];
 }
 
+- (void)removeLayoutConstraint:(TUILayoutConstraint *)constraint {
+	[[TUILayoutManager sharedLayoutManager] removeLayoutConstraint:constraint fromView:self];
+}
+
 - (NSArray *)layoutConstraints {
 	return [[TUILayoutManager sharedLayoutManager] layoutConstraintsOnView:self];
 }

diff --git a/lib/UIKit/TUIView+NSTextInputClient.h b/lib/UIKit/TUIView+NSTextInputClient.h
diff --git a/lib/UIKit/TUIView+NSTextInputClient.m b/lib/UIKit/TUIView+NSTextInputClient.m
diff --git a/lib/UIKit/TUIView.m b/lib/UIKit/TUIView.m
@@ -384,8 +384,8 @@ - (void)displayLayer:(CALayer *)layer
 			CGContextSetRGBFillColor(context, 0, 1, 0, 0.3);
 		} else {
 			CGContextSetRGBFillColor(context, 1, 0, 0, 0.3);
-			CGContextFillRect(context, rectToDraw);
 		}
+		CGContextFillRect(context, rectToDraw);
 		#endif
 
 		layer.contents = TUIGraphicsGetImageFromCurrentImageContext();