Fixed bug with disabled CPSegmentedButton

This commit is contained in:
Alexandre Wilhelm committed 2013-01-11 15:14:01 -08:00
1 parent 54f0a49281
commit 1e6d41e113
10 files changed
+3 -3

No files matched your search

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 B

After

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 B

After

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 B

After

Width:  |  Height:  |  Size: 1023 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 1.1 KiB

+3 -3
View File
@@ -1114,7 +1114,7 @@ var themedButtonValues = nil,
[@"font", [CPFont boldSystemFontOfSize:12.0]],
[@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
[@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled],
[@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled | CPThemeStateSelected],
[@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:0.5], CPThemeStateDisabled | CPThemeStateSelected],
[@"text-color", [CPColor whiteColor], CPThemeStateSelected],
[@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
[@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateDisabled],
@@ -1712,7 +1712,7 @@ var themedButtonValues = nil,
["progress-indicator-bar-bar-regular-center.png", 1.0, 25.0],
["progress-indicator-bar-bar-regular-right.png", 1.0, 25.0]
],
PatternIsHorizontal);
PatternIsHorizontal),
themedProgressIndicator =
[
@@ -1745,7 +1745,7 @@ var themedButtonValues = nil,
["progress-indicator-inderterminate-bar-bar-regular-center.png", 20.0, 25.0],
["progress-indicator-inderterminate-bar-bar-regular-right.png", 1.0, 25.0]
],
PatternIsHorizontal);
PatternIsHorizontal),
themedIndeterminateProgressIndicator =
[