work on making state transitions actually do something

smokyonion · Aug 2, 2011 · ffd8c7c · ffd8c7c
1 parent f826a86
commit ffd8c7c
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 21 deletions.
diff --git a/lib/UIKit/TUIButton+Content.m b/lib/UIKit/TUIButton+Content.m
@@ -125,27 +125,52 @@ - (TUIImage *)backgroundImageForState:(TUIControlState)state
 
 - (NSString *)currentTitle
 {
-	return [self titleForState:self.state];
+	NSString *title = [self titleForState:self.state];
+	if(title == nil) {
+		title = [self titleForState:TUIControlStateNormal];
+	}
+
+	return title;
 }
 
 - (TUIColor *)currentTitleColor
 {
-	return [self titleColorForState:self.state];
+	TUIColor *color = [self titleColorForState:self.state];
+	if(color == nil) {
+		color = [self titleColorForState:TUIControlStateNormal];
+	}
+
+	return color;
 }
 
 - (TUIColor *)currentTitleShadowColor
 {
-	return [self titleShadowColorForState:self.state];
+	TUIColor *color = [self titleShadowColorForState:self.state];
+	if(color == nil) {
+		color = [self titleShadowColorForState:TUIControlStateNormal];
+	}
+
+	return color;
 }
 
 - (TUIImage *)currentImage
 {
-	return [self imageForState:self.state];
+	TUIImage *image = [self imageForState:self.state];
+	if(image == nil) {
+		image = [self imageForState:TUIControlStateNormal];
+	}
+
+	return image;
 }
 
 - (TUIImage *)currentBackgroundImage
 {
-	return [self backgroundImageForState:self.state];
+	TUIImage *image = [self backgroundImageForState:self.state];
+	if(image == nil) {
+		image = [self backgroundImageForState:TUIControlStateNormal];
+	}
+
+	return image;
 }
 
 @end
diff --git a/lib/UIKit/TUIButton.h b/lib/UIKit/TUIButton.h
@@ -44,6 +44,7 @@ typedef enum {
     struct {
 		unsigned int dimsInBackground:1;
         unsigned int buttonType:8;
+		unsigned int firstDraw:1;
     } _buttonFlags;
 }
 

diff --git a/lib/UIKit/TUIButton.m b/lib/UIKit/TUIButton.m
@@ -18,6 +18,13 @@
 #import "TUIButton.h"
 #import "TUILabel.h"
 #import "TUINSView.h"
+#import "TUIControl+Private.h"
+
+@interface TUIButton ()
+
+- (void)_update;
+
+@end
 
 @implementation TUIButton
 
@@ -31,6 +38,7 @@ - (id)initWithFrame:(CGRect)frame
 		self.opaque = NO; // won't matter unless image is set
 		_buttonFlags.buttonType = TUIButtonTypeCustom;
 		_buttonFlags.dimsInBackground = 1;
+		_buttonFlags.firstDraw = 1;
 	}
 	return self;
 }
@@ -155,6 +163,11 @@ static CGRect ButtonRectCenteredInRect(CGRect a, CGRect b)
 
 - (void)drawRect:(CGRect)r
 {
+	if(_buttonFlags.firstDraw) {
+		[self _update];
+		_buttonFlags.firstDraw = 0;
+	}
+
 	CGRect bounds = self.bounds;
 
 	BOOL key = [self.nsWindow isKeyWindow];
@@ -164,11 +177,7 @@ - (void)drawRect:(CGRect)r
 		alpha = key?alpha:0.5;
 
 	TUIImage *backgroundImage = self.currentBackgroundImage;
-	if(!backgroundImage)
-		backgroundImage = [self backgroundImageForState:TUIControlStateNormal];
 	TUIImage *image = self.currentImage;
-	if(!image)
-		image = [self imageForState:TUIControlStateNormal];
 
 	[backgroundImage drawInRect:[self backgroundRectForBounds:bounds] blendMode:kCGBlendModeNormal alpha:1.0];
 
@@ -234,15 +243,28 @@ - (void)mouseDown:(NSEvent *)event
 - (void)mouseUp:(NSEvent *)event
 {
 	[super mouseUp:event];
-	if([event clickCount] < 2) {
+//	if([event clickCount] < 2) {
 		if([self eventInside:event]) {
 			if(![self didDrag]) {
 				[self sendActionsForControlEvents:TUIControlEventTouchUpInside];
 			}
 		} else {
 			[self sendActionsForControlEvents:TUIControlEventTouchUpOutside];
 		}
-	}
+//	}
+}
+
+- (void)_update {
+	_titleView.text = self.currentTitle;
+	_titleView.textColor = self.currentTitleColor;
+}
+
+- (void)_stateDidChange {
+	[super _stateDidChange];
+
+	[self _update];
+
+	[self setNeedsDisplay];
 }
 
 @end
diff --git a/lib/UIKit/TUIControl+Private.h b/lib/UIKit/TUIControl+Private.h
@@ -6,8 +6,11 @@
 //  Copyright 2011 Maybe Apps, LLC. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import "TUIControl.h"
 
-@interface TUIControl_Private : NSObject
+@interface TUIControl (Private)
+
+- (void)_stateWillChange;
+- (void)_stateDidChange;
 
 @end
diff --git a/lib/UIKit/TUIControl+Private.m b/lib/UIKit/TUIControl+Private.m
@@ -8,16 +8,16 @@
 
 #import "TUIControl+Private.h"
 
-@implementation TUIControl_Private
+@implementation TUIControl (Private)
 
-- (id)init
+- (void)_stateWillChange
 {
-    self = [super init];
-    if (self) {
-        // Initialization code here.
-    }
-    
-    return self;
+	
+}
+
+- (void)_stateDidChange
+{
+	
 }
 
 @end
diff --git a/lib/UIKit/TUIControl.m b/lib/UIKit/TUIControl.m
@@ -15,6 +15,7 @@
  */
 
 #import "TUIControl.h"
+#import "TUIControl+Private.h"
 
 @implementation TUIControl
 
@@ -64,14 +65,18 @@ - (BOOL)acceptsFirstMouse:(NSEvent *)event
 - (void)mouseDown:(NSEvent *)event
 {
 	[super mouseDown:event];
+	[self _stateWillChange];
 	_controlFlags.tracking = 1;
+	[self _stateDidChange];
 	[self setNeedsDisplay];
 }
 
 - (void)mouseUp:(NSEvent *)event
 {
 	[super mouseUp:event];
+	[self _stateWillChange];
 	_controlFlags.tracking = 0;
+	[self _stateDidChange];
 	[self setNeedsDisplay];
 }