mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-21 22:19:26 +00:00
Further work on CPTextField.
Reviewed by me.
This commit is contained in:
1 parent
80bc3e3455
commit
51ad4b2b06
5 files changed
+54
-58
No files matched your search
+7
-22
@@ -470,9 +470,6 @@ var _CPButtonClassName = nil,
|
||||
|
||||
- (CGRect)contentRectForBounds:(CGRect)bounds
|
||||
{
|
||||
if (![self isBordered])
|
||||
return bounds;
|
||||
|
||||
var contentInset = [self currentValueForThemedAttributeName:@"content-inset"];
|
||||
|
||||
if (!contentInset)
|
||||
@@ -575,18 +572,21 @@ var _CPButtonClassName = nil,
|
||||
|
||||
- (void)setBordered:(BOOL)shouldBeBordered
|
||||
{
|
||||
if (_isBordered === shouldBeBordered)
|
||||
if ((!!(_controlState & CPControlStateBordered)) === shouldBeBordered)
|
||||
return;
|
||||
|
||||
_isBordered = shouldBeBordered;
|
||||
|
||||
if (shouldBeBordered)
|
||||
_controlState |= CPControlStateBordered;
|
||||
else
|
||||
_controlState &= ~CPControlStateBordered;
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
- (BOOL)isBordered
|
||||
{
|
||||
return _isBordered;
|
||||
return !!(_controlState & CPControlStateBordered);
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -619,17 +619,12 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
if (self)
|
||||
{
|
||||
_controlSize = CPRegularControlSize;
|
||||
|
||||
var theme = [self theme],
|
||||
theClass = [self class];
|
||||
|
||||
[self setImage:[aCoder decodeObjectForKey:CPButtonImageKey]];
|
||||
[self setAlternateImage:[aCoder decodeObjectForKey:CPButtonAlternateImageKey]];
|
||||
|
||||
[self setTitle:[aCoder decodeObjectForKey:CPButtonTitleKey]];
|
||||
[self setAlternateTitle:[aCoder decodeObjectForKey:CPButtonAlternateTitleKey]];
|
||||
|
||||
_isBordered = [aCoder decodeBoolForKey:CPButtonIsBorderedKey];
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
@@ -644,24 +639,14 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
*/
|
||||
- (void)encodeWithCoder:(CPCoder)aCoder
|
||||
{
|
||||
// We do this in order to avoid encoding the _imageAndTextView, which
|
||||
// should just automatically be created programmatically as needed.
|
||||
var actualSubviews = _subviews;
|
||||
|
||||
// _subviews = [_subviews copy];
|
||||
// [_subviews removeObjectIdenticalTo:_imageAndTextView];
|
||||
|
||||
[super encodeWithCoder:aCoder];
|
||||
|
||||
_subviews = actualSubviews;
|
||||
|
||||
[aCoder encodeObject:_image forKey:CPButtonImageKey];
|
||||
[aCoder encodeObject:_alternateImage forKey:CPButtonAlternateImageKey];
|
||||
|
||||
[aCoder encodeObject:_title forKey:CPButtonTitleKey];
|
||||
[aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
|
||||
|
||||
[aCoder encodeBool:_isBordered forKey:CPButtonIsBorderedKey];
|
||||
[aCoder encodeInt:_bezelStyle forKey:CPButtonBezelStyleKey];
|
||||
}
|
||||
|
||||
|
||||
+5
-3
@@ -572,6 +572,7 @@ BRIDGE(ImageScaling, imageScaling, "image-scaling")
|
||||
@end
|
||||
|
||||
var CPControlValueKey = "CPControlValueKey",
|
||||
CPControlControlStateKey = @"CPControlControlStateKey",
|
||||
CPControlIsEnabledKey = "CPControlIsEnabledKey",
|
||||
|
||||
CPControlTargetKey = "CPControlTargetKey",
|
||||
@@ -590,11 +591,11 @@ var __Deprecated__CPImageViewImageKey = @"CPImageViewImageKey";
|
||||
- (id)initWithCoder:(CPCoder)aCoder
|
||||
{
|
||||
self = [super initWithCoder:aCoder];
|
||||
|
||||
|
||||
if (self)
|
||||
{
|
||||
_controlState = CPControlStateNormal;
|
||||
|
||||
_controlState = [aCoder decodeObjectForKey:CPControlControlStateKey];
|
||||
|
||||
[self setObjectValue:[aCoder decodeObjectForKey:CPControlValueKey]];
|
||||
|
||||
/*
|
||||
@@ -630,6 +631,7 @@ var __Deprecated__CPImageViewImageKey = @"CPImageViewImageKey";
|
||||
if (subviews)
|
||||
_subviews = subviews;
|
||||
|
||||
[aCoder encodeObject:_controlState forKey:CPControlControlStateKey];
|
||||
[aCoder encodeObject:_value forKey:CPControlValueKey];
|
||||
|
||||
/*[aCoder encodeBool:_isEnabled forKey:CPControlIsEnabledKey];
|
||||
|
||||
+36
-31
@@ -71,7 +71,7 @@ CPTextFieldSquareBezel = 0;
|
||||
@global
|
||||
@group CPTextFieldBezelStyle
|
||||
*/
|
||||
CPTextFieldRoundedBezel = 1;
|
||||
CPTextFieldRoundedBezel = 1;
|
||||
|
||||
var TOP_PADDING = 4.0,
|
||||
BOTTOM_PADDING = 3.0;
|
||||
@@ -97,6 +97,8 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
|
||||
@end
|
||||
|
||||
CPTextFieldStateRounded = 1 << 12;
|
||||
|
||||
/*!
|
||||
This control displays editable text in a Cappuccino application.
|
||||
*/
|
||||
@@ -235,12 +237,16 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (void)setBezeled:(BOOL)shouldBeBezeled
|
||||
{
|
||||
if (_isBezeled == shouldBeBezeled)
|
||||
if ((!!(_controlState & CPControlStateBezeled)) === shouldBeBezeled)
|
||||
return;
|
||||
|
||||
_isBezeled = shouldBeBezeled;
|
||||
|
||||
[self _updateBackground];
|
||||
if (shouldBeBezeled)
|
||||
_controlState |= CPControlStateBezeled;
|
||||
else
|
||||
_controlState &= ~CPControlStateBezeled;
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -248,7 +254,7 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (BOOL)isBezeled
|
||||
{
|
||||
return _isBezeled;
|
||||
return !!(_controlState & CPControlStateBezeled);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -257,19 +263,18 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (void)setBezelStyle:(CPTextFieldBezelStyle)aBezelStyle
|
||||
{
|
||||
if (_bezelStyle == aBezelStyle)
|
||||
var shouldBeRounded = aBezelStyle === CPTextFieldRoundedBezel;
|
||||
|
||||
if ((!!(_controlState & CPTextFieldStateRounded)) === shouldBeRounded)
|
||||
return;
|
||||
|
||||
_bezelStyle = aBezelStyle;
|
||||
|
||||
/*#if PLATFORM(DOM)
|
||||
if (aBezelStyle == CPTextFieldRoundedBezel)
|
||||
_DOMTextElement.style.paddingLeft = ROUNDEDBEZEL_HORIZONTAL_PADDING - 1.0 + "px";
|
||||
else
|
||||
_DOMTextElement.style.paddingLeft = "0px";
|
||||
#endif
|
||||
if (shouldBeRounded)
|
||||
_controlState |= CPTextFieldStateRounded;
|
||||
else
|
||||
_controlState &= ~CPTextFieldStateRounded;
|
||||
|
||||
[self _updateBackground];*/
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -277,7 +282,10 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (CPTextFieldBezelStyle)bezelStyle
|
||||
{
|
||||
return _bezelStyle;
|
||||
if (_controlState & CPTextFieldStateRounded)
|
||||
return CPTextFieldRoundedBezel;
|
||||
|
||||
return CPTextFieldSquareBezel;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -286,12 +294,16 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (void)setBordered:(BOOL)shouldBeBordered
|
||||
{
|
||||
if (_isBordered == shouldBeBordered)
|
||||
if ((!!(_controlState & CPControlStateBordered)) === shouldBeBordered)
|
||||
return;
|
||||
|
||||
_isBordered = shouldBeBordered;
|
||||
|
||||
[self _updateBackground];
|
||||
if (shouldBeBordered)
|
||||
_controlState |= CPControlStateBordered;
|
||||
else
|
||||
_controlState &= ~CPControlStateBordered;
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -299,7 +311,7 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
*/
|
||||
- (BOOL)isBordered
|
||||
{
|
||||
return _isBordered;
|
||||
return !!(_controlState & CPControlStateBordered);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -673,7 +685,7 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
- (void)sizeToFit
|
||||
{
|
||||
var size = [(_value || " ") sizeWithFont:[self font]],
|
||||
contentInset = [self currentValueForThemedAttributeName:([self isBezeled] ? @"bezeled" : "") + @"content-inset"];
|
||||
contentInset = [self currentValueForThemedAttributeName:@"content-inset"];
|
||||
|
||||
[self setFrameSize:CGSizeMake(size.width + contentInset.left + contentInset.right, size.height + contentInset.top + contentInset.bottom)];
|
||||
/*#if PLATFORM(DOM)
|
||||
@@ -750,7 +762,7 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
|
||||
- (CGRect)contentRectForBounds:(CGRect)bounds
|
||||
{
|
||||
var contentInset = [self currentValueForThemedAttributeName:([self isBezeled] ? @"bezeled" : @"") + @"content-inset"];
|
||||
var contentInset = [self currentValueForThemedAttributeName:@"content-inset"];
|
||||
|
||||
if (!contentInset)
|
||||
return bounds;
|
||||
@@ -765,9 +777,6 @@ var _CPTextFieldSquareBezelColor = nil,
|
||||
|
||||
- (CGRect)bezelRectForBounds:(CFRect)bounds
|
||||
{
|
||||
if (![self isBezeled])
|
||||
return _CGRectMakeZero();
|
||||
|
||||
var bezelInset = [self currentValueForThemedAttributeName:@"bezel-inset"];
|
||||
|
||||
if (!_CGInsetIsEmpty(bezelInset))
|
||||
@@ -929,8 +938,6 @@ var CPTextFieldIsEditableKey = "CPTextFieldIsEditableKey",
|
||||
[self setEditable:[aCoder decodeBoolForKey:CPTextFieldIsEditableKey]];
|
||||
[self setSelectable:[aCoder decodeBoolForKey:CPTextFieldIsSelectableKey]];
|
||||
|
||||
[self setBordered:[aCoder decodeBoolForKey:CPTextFieldIsBorderedKey]];
|
||||
[self setBezeled:[aCoder decodeBoolForKey:CPTextFieldIsBezeledKey]];
|
||||
[self setBezelStyle:[aCoder decodeIntForKey:CPTextFieldBezelStyleKey]];
|
||||
[self setDrawsBackground:[aCoder decodeBoolForKey:CPTextFieldDrawsBackgroundKey]];
|
||||
|
||||
@@ -953,8 +960,6 @@ var CPTextFieldIsEditableKey = "CPTextFieldIsEditableKey",
|
||||
[aCoder encodeBool:_isEditable forKey:CPTextFieldIsEditableKey];
|
||||
[aCoder encodeBool:_isSelectable forKey:CPTextFieldIsSelectableKey];
|
||||
|
||||
[aCoder encodeBool:_isBordered forKey:CPTextFieldIsBorderedKey];
|
||||
[aCoder encodeBool:_isBezeled forKey:CPTextFieldIsBezeledKey];
|
||||
[aCoder encodeInt:_bezelStyle forKey:CPTextFieldBezelStyleKey];
|
||||
[aCoder encodeBool:_drawsBackground forKey:CPTextFieldDrawsBackgroundKey];
|
||||
|
||||
|
||||
@@ -44,9 +44,11 @@ _CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20;
|
||||
_controlSize = CPRegularControlSize;
|
||||
|
||||
var cell = [aCoder decodeObjectForKey:@"NSCell"];
|
||||
|
||||
|
||||
_title = [cell title];
|
||||
_isBordered = [cell isBordered];
|
||||
|
||||
[self setBordered:[cell isBordered]];
|
||||
|
||||
_bezelStyle = [cell bezelStyle];
|
||||
|
||||
// clean up:
|
||||
|
||||
@@ -34,6 +34,8 @@
|
||||
|
||||
if (self)
|
||||
{
|
||||
_controlState = CPControlStateNormal;
|
||||
|
||||
[self sendActionOn:CPLeftMouseUpMask];
|
||||
|
||||
var cell = [aCoder decodeObjectForKey:@"NSCell"];
|
||||
|
||||
Reference in new issue
Block a user