Tools/nib2cib/NSColorWell.j @@ -38,6 +38,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv @implementation CPColorWell : CPControl { BOOL _active; + BOOL _bordered; CPColor _color; CPView _wellView; @@ -50,30 +51,56 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv if (self) { _active = NO; - + _bordered = YES; _color = [CPColor whiteColor]; [self drawBezelWithHighlight:NO]; [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)]; - var defaultCenter = [CPNotificationCenter defaultCenter]; - - [defaultCenter - addObserver:self - selector:@selector(colorWellDidBecomeExclusive:) - name:_CPColorWellDidBecomeExclusiveNotification - object:nil]; - - [defaultCenter - addObserver:self - selector:@selector(colorPanelWillClose:) - name:CPWindowWillCloseNotification - object:[CPColorPanel sharedColorPanel]]; + [self _registerForNotifications]; } return self; } +- (void)_registerForNotifications +{ + var defaultCenter = [CPNotificationCenter defaultCenter]; + + [defaultCenter + addObserver:self + selector:@selector(colorWellDidBecomeExclusive:) + name:_CPColorWellDidBecomeExclusiveNotification + object:nil]; + + [defaultCenter + addObserver:self + selector:@selector(colorPanelWillClose:) + name:CPWindowWillCloseNotification + object:[CPColorPanel sharedColorPanel]]; +} + +/*! + Returns whether the color well is bordered +*/ +- (BOOL)isBordered +{ + return _bordered; +} + +/*! + Sets the color well's current color. +*/ +- (void)setBordered:(BOOL)bordered +{ + if (_bordered == bordered) + return; + + _bordered = bordered; + + [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)]; +} + // Managing Color From Color Wells /*! @@ -226,3 +253,51 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv } @end + +var CPColorWellColorKey = "CPColorWellColorKey", + CPColorWellBorderedKey = "CPColorWellBorderedKey"; + +@implementation CPColorWell (CPCoding) + +/*! + Initializes the color well by unarchiving data from <code>aCoder</code>. + @param aCoder the coder containing the archived <objj>CPColorWell</objj>. +*/ +- (id)initWithCoder:(CPCoder)aCoder +{ + self = [super initWithCoder:aCoder]; + + if (self) + { + _active = NO; + _bordered = [aCoder decodeObjectForKey:CPColorWellBorderedKey]; + _color = [aCoder decodeObjectForKey:CPColorWellColorKey]; + + [self _registerForNotifications]; + } + + return self; +} + +/*! + Archives this button into the provided coder. + @param aCoder the coder to which the color well's instance data will be written. +*/ +- (void)encodeWithCoder:(CPCoder)aCoder +{ + // We do this in order to avoid encoding the _wellView, which + // should just automatically be created programmatically as needed. + var actualSubviews = _subviews; + + _subviews = [_subviews copy]; + [_subviews removeObjectIdenticalTo:_wellView]; + + [super encodeWithCoder:aCoder]; + + _subviews = actualSubviews; + + [aCoder encodeObject:_color forKey:CPColorWellColorKey]; + [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey]; +} + +@end AppKit/CPColorWell.j @@ -23,6 +23,7 @@ @import "NSButton.j" @import "NSCell.j" @import "NSColor.j" +@import "NSColorWell.j" @import "NSControl.j" @import "NSCustomObject.j" @import "NSCustomView.j" Tools/nib2cib/NSAppKit.j 1457f5d1c89bd293c34f55bdc19e385936742fab Tom Robinson tom@280north.com http://github.com/280north/cappuccino/commit/ed5aa5b54c03d8e0b11913312667b0fdff2412e7 ed5aa5b54c03d8e0b11913312667b0fdff2412e7 2008-10-28T01:08:07-07:00 2008-10-28T01:08:07-07:00 CPColorWell coding and nib2cib support. 6ca818cb132124ae48081e828a658aad251d5383 Tom Robinson tom@280north.com