properly fix CPThemeStateNormal behavior

- revert the previous fix
- explicitly check for CPThemeStateNormal in hasThemeState:
- update the test case
This commit is contained in:
Klaas Pieter Annema committed 2011-01-05 12:30:14 +01:00
1 parent b6ea6530b7
commit c87cb4bacd
3 files changed
+15 -10

No files matched your search

+4 -4
View File
@@ -350,7 +350,7 @@ function CPThemeState(aStateName)
if (state === undefined)
{
if (aStateName.indexOf('+') === -1)
state = 1 << ++CPThemeStateCount;
state = 1 << CPThemeStateCount++;
else
{
var state = 0,
@@ -364,7 +364,7 @@ function CPThemeState(aStateName)
if (individualState === undefined)
{
individualState = 1 << ++CPThemeStateCount;
individualState = 1 << CPThemeStateCount++;
CPThemeStates[stateName] = individualState;
CPThemeStateNames[individualState] = stateName;
}
@@ -402,8 +402,8 @@ function CPThemeStateName(aState)
return name;
}
CPThemeStateNames[1] = "normal";
CPThemeStateNormal = CPThemeStates["normal"] = 1;
CPThemeStateNames[0] = "normal";
CPThemeStateNormal = CPThemeStates["normal"] = 0;
CPThemeStateDisabled = CPThemeState("disabled");
CPThemeStateHovered = CPThemeState("hovered");
CPThemeStateHighlighted = CPThemeState("highlighted");
+4
View File
@@ -2260,6 +2260,10 @@ setBoundsOrigin:
- (BOOL)hasThemeState:(CPThemeState)aState
{
// Because CPThemeStateNormal is defined as 0 we need to check for it explicitly here
if (aState === CPThemeStateNormal && _themeState === CPThemeStateNormal)
return YES;
return !!(_themeState & ((typeof aState === "string") ? CPThemeState(aState) : aState));
}
+7 -6
View File
@@ -44,17 +44,18 @@
- (void)testThemeState
{
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[self assertTrue:[view hasThemeState:CPThemeStateNormal] message:@"CPView should initialy have CPThemeStateNormal"];
[self assertFalse:[view hasThemeState:CPThemeStateDisabled] message:@"view should be disabled"];
[view setThemeState:CPThemeStateNormal];
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[view setThemeState:CPThemeStateDisabled];
[self assertTrue:[view hasThemeState:CPThemeStateDisabled] message:@"The view should be CPThemeStateDisabled"];
[view setThemeState:CPThemeStateHighlighted];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted]];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted] message:@"Theme state should be CPThemeStateHighlighted"];
[view setThemeState:CPThemeStateNormal | CPThemeStateHighlighted];
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted]];
[self assertFalse:[view hasThemeState:CPThemeStateNormal] message:@"CPThemeStateNormal cannot exist as part of a compound state"];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted] message:@"The view should be CPThemeStateHighlighted"];
}
@end