colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-15 03:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: spinner style progress indicators were nib2cibbed to progress bars.

Browse Source
This commit is contained in:
Alexander Ljungberg committed 2012-03-16 18:23:47 +00:00
1 parent 516fac037f
commit 5097030143
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPProgressIndicator.j
+2 -2
View File
@@ -477,7 +477,7 @@ var CPProgressIndicatorSpinningStyleColors = nil,
_doubleValue = [aCoder decodeObjectForKey:@"_doubleValue"];
_controlSize = [aCoder decodeObjectForKey:@"_controlSize"];
_isIndeterminate = [aCoder decodeObjectForKey:@"_isIndeterminate"];
_style = [aCoder decodeObjectForKey:@"_style"];
_style = [aCoder decodeIntForKey:@"_style"];
_isAnimating = [aCoder decodeObjectForKey:@"_isAnimating"];
_isDisplayedWhenStoppedSet = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
_isDisplayedWhenStopped = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
@@ -495,7 +495,7 @@ var CPProgressIndicatorSpinningStyleColors = nil,
[aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
[aCoder encodeObject:_controlSize forKey:@"_controlSize"];
[aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
[aCoder encodeObject:_style forKey:@"_style"];
[aCoder encodeInt:_style forKey:@"_style"];
[aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
[aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
[aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
Tools/nib2cib/NSProgressIndicator.j
+2 -1
View File
@@ -22,6 +22,7 @@
@import <AppKit/CPProgressIndicator.j>
var NSProgressIndicatorSpinningFlag = 1 << 12;
@implementation CPProgressIndicator (NSCoding)
@@ -36,7 +37,7 @@
_minValue = [aCoder decodeDoubleForKey:@"NSMinValue"] || 0;
_maxValue = [aCoder decodeDoubleForKey:@"NSMaxValue"];
_style = (NS_flags & CPProgressIndicatorSpinningStyle) ? CPProgressIndicatorSpinningStyle : CPProgressIndicatorBarStyle;
_style = (NS_flags & NSProgressIndicatorSpinningFlag) ? CPProgressIndicatorSpinningStyle : CPProgressIndicatorBarStyle;
_isIndeterminate = (NS_flags & 2) ? YES : NO;
_isDisplayedWhenStopped = (NS_flags & 8192) ? NO : YES;
_controlSize = CPRegularControlSize;