Merge branch '0.7b' of git@github.com:280north/cappuccino into 0.7

This commit is contained in:
Ross Boucher committed 2009-03-27 17:02:21 -07:00
commit 4963f8401a
5 files changed
+55 -86

No files matched your search

+9 -15
View File
@@ -892,13 +892,10 @@ var _CPTableViewWillDisplayCellSelector = 1 << 0,
{
var half = a + Math.floor((b - a) / 2);
if (half === _numberOfRows - 1)
return _numberOfRows - 1;
if (y >= _rowMinYs[half+1])
a = half;
else if (y < _rowMinYs[half])
if (y < _rowMinYs[half])
b = half;
else if (half < _numberOfRows-1 && y >= _rowMinYs[half+1])
a = half;
else
return half;
}
@@ -912,15 +909,15 @@ var _CPTableViewWillDisplayCellSelector = 1 << 0,
Internal version takes a X value, returns an index, or -1 if its beyond the min, or numberOfColumns if it's beyond the max
*/
- (int)_columnAtX:(float)y
- (int)_columnAtX:(float)x
{
var a = 0,
b = _tableColumns.length;
var last = [_tableColumnViews[_tableColumns.length-1] frame];
if (y < [_tableColumnViews[0] frame].origin.x)
if (x < [_tableColumnViews[0] frame].origin.x)
return -1;
if (y >= last.origin.x + last.size.width)
if (x >= last.origin.x + last.size.width)
return _tableColumns.length;
// binary search
@@ -928,13 +925,10 @@ var _CPTableViewWillDisplayCellSelector = 1 << 0,
{
var half = a + Math.floor((b - a) / 2);
if (half === _tableColumns.length - 1)
return _tableColumns.length - 1;
if (y >= [_tableColumnViews[half+1] frame].origin.x)
a = half;
else if (y < [_tableColumnViews[half] frame].origin.x)
if (x < [_tableColumnViews[half] frame].origin.x)
b = half;
else if (half < _tableColumns.length-1 && x >= [_tableColumnViews[half+1] frame].origin.x)
a = half;
else
return half;
}
+32 -59
View File
@@ -131,17 +131,12 @@ CPTextFieldStatePlaceholder = 1 << 13;
{
CPTextFieldDOMInputElement = document.createElement("input");
CPTextFieldDOMInputElement.style.position = "absolute";
CPTextFieldDOMInputElement.style.top = "0px";
CPTextFieldDOMInputElement.style.left = "0px";
CPTextFieldDOMInputElement.style.width = "100%"
CPTextFieldDOMInputElement.style.height = "100%";
CPTextFieldDOMInputElement.style.border = "0px";
CPTextFieldDOMInputElement.style.padding = "0px";
CPTextFieldDOMInputElement.style.margin = "0px";
CPTextFieldDOMInputElement.style.whiteSpace = "pre";
CPTextFieldDOMInputElement.style.background = "transparent";
CPTextFieldDOMInputElement.style.outline = "none";
CPTextFieldDOMInputElement.style.paddingLeft = HORIZONTAL_PADDING - 1.0 + "px";
CPTextFieldDOMInputElement.style.paddingTop = TOP_PADDING - 2.0 + "px";
}
return CPTextFieldDOMInputElement;
@@ -333,40 +328,30 @@ CPTextFieldStatePlaceholder = 1 << 13;
/* @ignore */
- (BOOL)acceptsFirstResponder
{
return _isEditable && _isEnabled;
return [self isEditable] && [self isEnabled];
}
/* @ignore */
- (BOOL)becomeFirstResponder
{
[_contentView setHidden:YES];
var string = [self stringValue];
[self setStringValue:""];
_controlState |= CPControlStateEditing;
[self setNeedsLayout];
#if PLATFORM(DOM)
var element = [[self class] _inputElement];
var string = [self stringValue],
element = [[self class] _inputElement];
element.value = "hey there hot shot";//string;
element.style.color = _DOMElement.style.color;
element.style.font = _DOMElement.style.font;
element.value = string;
element.style.color = [[self currentValueForThemedAttributeName:@"text-color"] cssString];
element.style.font = [[self currentValueForThemedAttributeName:@"font"] cssString];
element.style.zIndex = 1000;
element.style.marginTop = "0px";
if (_isBezeled && _bezelStyle == CPTextFieldRoundedBezel)
{
// http://cappuccino.lighthouseapp.com/projects/16499/tickets/191-cptextfield-shifts-updown-when-receiveslosts-focus
// uncommenting the following 2 lines will solve the problem in Firefox only ...
// element.style.paddingTop = TOP_PADDING - 0.0 + "px" ;
// element.style.paddingLeft = HORIZONTAL_PADDING - 3.0 + "px" ;
element.style.top = "0px" ;
element.style.left = ROUNDEDBEZEL_HORIZONTAL_PADDING + 1.0 + "px" ;
element.style.width = CGRectGetWidth([self bounds]) - (2 * ROUNDEDBEZEL_HORIZONTAL_PADDING) - 2.0 + "px";
}
else
{
element.style.width = CGRectGetWidth([self bounds]) - 3.0 + "px";
}
var contentRect = [self contentRectForBounds:[self bounds]];
element.style.top = _CGRectGetMinY(contentRect) + "px";
element.style.left = (_CGRectGetMinX(contentRect) - 1) + "px"; // why -1?
element.style.width = _CGRectGetWidth(contentRect) + "px";
element.style.height = _CGRectGetHeight(contentRect) + "px";
_DOMElement.appendChild(element);
// [anEvent _DOMEvent].
@@ -440,10 +425,6 @@ CPTextFieldStatePlaceholder = 1 << 13;
}
[[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
};
// If current value is the placeholder value, remove it to allow user to update.
if ([string lowercaseString] == [[self placeholderString] lowercaseString])
element.value = "";
//post CPControlTextDidBeginEditingNotification
[self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
@@ -457,22 +438,23 @@ CPTextFieldStatePlaceholder = 1 << 13;
/* @ignore */
- (BOOL)resignFirstResponder
{
_controlState &= ~CPControlStateEditing;
[self setNeedsLayout];
#if PLATFORM(DOM)
var element = [[self class] _inputElement];
//nil out dom handlers
element.onkeyup = nil;
element.onkeydown = nil;
element.onkeypress = nil;
element.onkeyup = NULL;
element.onkeydown = NULL;
element.onkeypress = NULL;
_DOMElement.removeChild(element);
[self setStringValue:element.value]; // redundant?
// If textfield has no value, then display the placeholderValue
if (!_value)
[self setStringValue:[self placeholderString]];
// Is this redundant?
[self setStringValue:element.value];
#endif
//post CPControlTextDidEndEditingNotification
[self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
@@ -481,20 +463,12 @@ CPTextFieldStatePlaceholder = 1 << 13;
- (void)mouseDown:(CPEvent)anEvent
{
if (![self isEditable])
// Don't track! (ever?)
if ([self isEditable] && [self isEnabled])
return [[self window] makeFirstResponder:self];
else
return [[self nextResponder] mouseDown:anEvent];
[super mouseDown:anEvent];
}
/*
- (void)mouseUp:(CPEvent)anEvent
{
if (_isEditable && [[self window] firstResponder] == self)
return;
[super mouseUp:anEvent];
}
*/
/*!
Returns the string the text field.
@@ -506,9 +480,6 @@ CPTextFieldStatePlaceholder = 1 << 13;
if ([[self window] firstResponder] == self)
return [[self class] _inputElement].value;
#endif
//if the content is the same as the placeholder value, return "" instead
if ([super objectValue] == [self placeholderString])
return "";
return [super objectValue];
}
@@ -709,6 +680,8 @@ CPTextFieldStatePlaceholder = 1 << 13;
if (contentView)
{
[contentView setHidden:_controlState & CPControlStateEditing];
if (_controlState & CPTextFieldStatePlaceholder)
[contentView setText:[self placeholderString]];
else
@@ -780,4 +753,4 @@ var CPTextFieldIsEditableKey = "CPTextFieldIsEditableKey",
[aCoder encodeObject:_placeholderString forKey:CPTextFieldPlaceholderStringKey];
}
@end
@end
+3 -1
View File
@@ -9,7 +9,9 @@ CPControlStateSelected = 1 << 2,
CPControlStateDefault = 1 << 3,
CPControlStateBordered = 1 << 4,
CPControlStateBezeled = 1 << 5,
CPControlStateVertical = 1 << 6;
CPControlStateVertical = 1 << 6,
CPControlStateEditable = 1 << 7,
CPControlStateEditing = 1 << 8;
var BIT_COUNT = [ 0 /*00000*/, 1 /*00001*/, 1 /*00010*/, 2 /*00011*/, 1 /*00100*/, 2 /*00101*/, 2 /*00110*/, 3 /*00111*/,
1 /*01000*/, 2 /*01001*/, 2 /*01010*/, 3 /*01011*/, 2 /*01100*/, 3 /*01101*/, 3 /*01110*/, 4 /*01111*/,
+10 -10
View File
@@ -1,15 +1,15 @@
//
// main.j
// Editor
//
// Created by Francisco Tolmasky on May 21, 2008.
// Copyright 2005 - 2008, 280 North, Inc. All rights reserved.
//
/*
* main.j
* __Product__
*
* Created by __Me__ on __Date__.
* Copyright 2008 __MyCompanyName__. All rights reserved.
*/
import <Foundation/Foundation.j>
import <AppKit/AppKit.j>
@import <Foundation/Foundation.j>
@import <AppKit/AppKit.j>
import "AppController.j"
@import "AppController.j"
CPLogRegister(CPLogPopup);
+1 -1
View File
@@ -65,7 +65,7 @@ var NSUnknownColorSpaceModel = -1,
case 4: // [NSColor colorWithDeviceWhite:values[0] alpha:values[1]];
var bytes = [aCoder decodeBytesForKey:@"NSWhite"],
string = bytes_to_string(rgb),
string = bytes_to_string(bytes),
components = [string componentsSeparatedByString:@" "],
values = [0,1];