colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-06 00:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

hasThemeState: always returned no for normal state

Browse Source
This commit is contained in:
Klaas Pieter Annema committed 2011-01-05 10:44:50 +01:00
1 parent af4e69afc9
commit b6ea6530b7
2 files changed
+19 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPTheme.j
+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[0] = "normal";
CPThemeStateNormal = CPThemeStates["normal"] = 0;
CPThemeStateNames[1] = "normal";
CPThemeStateNormal = CPThemeStates["normal"] = 1;
CPThemeStateDisabled = CPThemeState("disabled");
CPThemeStateHovered = CPThemeState("hovered");
CPThemeStateHighlighted = CPThemeState("highlighted");
Tests/AppKit/CPViewTest.j
+15
View File
@@ -42,4 +42,19 @@
[self assert:undefined same:[_CPDisplayServer run]];
}
- (void)testThemeState
{
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[view setThemeState:CPThemeStateNormal];
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[view setThemeState:CPThemeStateHighlighted];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted]];
[view setThemeState:CPThemeStateNormal | CPThemeStateHighlighted];
[self assertTrue:[view hasThemeState:CPThemeStateNormal]];
[self assertTrue:[view hasThemeState:CPThemeStateHighlighted]];
}
@end