New: CPThemeStateFirstResponder for CPView.

When a CPView becomes the first responder it now takes on the 'first responder' theme state, as does all its subviews. This allows it to naturally change appearance when it has the keyboard focus, such as with focus rings and brighter colour schemes.
This commit is contained in:
Alexander Ljungberg committed 2014-05-11 15:48:37 +01:00
1 parent c9642fcf35
commit 050fcf2ab8
3 files changed
+191

No files matched your search

+1
View File
@@ -515,6 +515,7 @@ CPThemeStateVertical = CPThemeState("vertical");
CPThemeStateDefault = CPThemeState("default");
CPThemeStateCircular = CPThemeState("circular");
CPThemeStateAutocompleting = CPThemeState("autocompleting");
CPThemeStateFirstResponder = CPThemeState("firstResponder");
CPThemeStateMainWindow = CPThemeState("mainWindow");
CPThemeStateKeyWindow = CPThemeState("keyWindow");
+33
View File
@@ -2928,6 +2928,39 @@ setBoundsOrigin:
return YES;
}
- (BOOL)becomeFirstResponder
{
var r = [super becomeFirstResponder];
if (r)
[self _notifyViewDidBecomeFirstResponder];
return r;
}
- (void)_notifyViewDidBecomeFirstResponder
{
[self setThemeState:CPThemeStateFirstResponder];
var count = [_subviews count];
while (count--)
[_subviews[count] _notifyViewDidBecomeFirstResponder];
}
- (BOOL)resignFirstResponder
{
var r = [super resignFirstResponder];
if (r)
[self _notifyViewDidResignFirstResponder];
return r;
}
- (void)_notifyViewDidResignFirstResponder
{
[self unsetThemeState:CPThemeStateFirstResponder];
var count = [_subviews count];
while (count--)
[_subviews[count] _notifyViewDidResignFirstResponder];
}
#pragma mark Theme Attributes
+ (CPString)defaultThemeClass
+157
View File
@@ -244,5 +244,162 @@
[self assertTrue:CGPointEqualToPoint(CGPointMake(4, 6), [subView0 convertPoint:CGPointMake(7, 11) fromView:tView0])]
}
+ (CPArray)createResponderView:(/*@ref */CPView)viewOut siblingView:(/*@ref */CPView)siblingViewOut inWindow:(/*@ref */CPWindow)windowOut
{
var aView = [CPResponderView new],
siblingView = [CPResponderView new],
aWindow = [CPWindow new];
[[aWindow contentView] addSubview:aView];
[[aWindow contentView] addSubview:siblingView];
if (viewOut)
@deref(viewOut) = aView;
if (siblingViewOut)
@deref(siblingViewOut) = siblingView;
if (windowOut)
@deref(windowOut) = aWindow;
return aView;
}
- (void)testWhenFirstResponderShouldHaveThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
[self assertFalse:[aView hasThemeState:CPThemeStateFirstResponder]];
[self assertFalse:[siblingView hasThemeState:CPThemeStateFirstResponder]];
[aWindow makeFirstResponder:aView];
[self assertTrue:[aView hasThemeState:CPThemeStateFirstResponder]];
[aWindow makeFirstResponder:siblingView];
[self assertTrue:[siblingView hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenChildOfFirstResponderShouldHaveThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var subview = [CPView new];
[aView addSubview:subview];
[aWindow makeFirstResponder:aView];
[self assertTrue:[aView hasThemeState:CPThemeStateFirstResponder]];
[self assertTrue:[subview hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenNotFirstResponderShouldLoseThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
[aWindow makeFirstResponder:aView];
[self assertFalse:[siblingView hasThemeState:CPThemeStateFirstResponder]];
[aWindow makeFirstResponder:siblingView];
[self assertFalse:[aView hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenNotChildOfFirstResponderShouldLoseThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var subview = [CPView new];
[aView addSubview:subview];
[aWindow makeFirstResponder:aView];
[self assertTrue:[aView hasThemeState:CPThemeStateFirstResponder]];
[self assertTrue:[subview hasThemeState:CPThemeStateFirstResponder]];
[aWindow makeFirstResponder:siblingView];
[self assertFalse:[aView hasThemeState:CPThemeStateFirstResponder]];
[self assertFalse:[subview hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenFirstResponderButNotKeyWindowShouldStillHaveThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var aView2, siblingView2, aWindow2;
[CPViewTest createResponderView:@ref(aView2) siblingView:@ref(siblingView2) inWindow:@ref(aWindow2)];
[aWindow makeKeyWindow];
[aWindow makeFirstResponder:aView];
[self assertTrue:[aView hasThemeState:CPThemeStateFirstResponder]];
[aWindow2 makeFirstResponder:siblingView];
[aWindow2 makeKeyWindow];
[self assertTrue:[aView hasThemeState:CPThemeStateFirstResponder]];
[self assertTrue:[siblingView hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenChildOfFirstResponderButNotKeyWindowShouldStillHaveThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var subview = [CPView new];
[aView addSubview:subview];
var aView2, siblingView2, aWindow2;
[CPViewTest createResponderView:@ref(aView2) siblingView:@ref(siblingView2) inWindow:@ref(aWindow2)];
[aWindow makeKeyWindow];
[aWindow makeFirstResponder:aView];
[aWindow2 makeFirstResponder:siblingView];
[aWindow2 makeKeyWindow];
[self assertTrue:[subview hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenNotFirstResponderButNotKeyWindowShouldStillLoseThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var aView2, siblingView2, aWindow2;
[CPViewTest createResponderView:@ref(aView2) siblingView:@ref(siblingView2) inWindow:@ref(aWindow2)];
[aWindow makeKeyWindow];
[aWindow makeFirstResponder:aView];
[aWindow2 makeFirstResponder:siblingView];
[aWindow2 makeKeyWindow];
[aWindow makeFirstResponder:siblingView];
[self assertFalse:[aView hasThemeState:CPThemeStateFirstResponder]];
}
- (void)testWhenNotChildOfFirstResponderButNotKeyWindowShouldShouldStillLoseThemeStateFirstResponder
{
var aView, siblingView, aWindow;
[CPViewTest createResponderView:@ref(aView) siblingView:@ref(siblingView) inWindow:@ref(aWindow)];
var subview = [CPView new];
[aView addSubview:subview];
var aView2, siblingView2, aWindow2;
[CPViewTest createResponderView:@ref(aView2) siblingView:@ref(siblingView2) inWindow:@ref(aWindow2)];
[aWindow makeKeyWindow];
[aWindow makeFirstResponder:aView];
[aWindow2 makeFirstResponder:siblingView];
[aWindow2 makeKeyWindow];
[aWindow makeFirstResponder:siblingView];
[self assertFalse:[subview hasThemeState:CPThemeStateFirstResponder]];
}
@end
@implementation CPResponderView : CPView
- (BOOL)acceptsFirstResponder
{
return YES;
}
@end