Merge branch 'master' into coretext

Still needs a lot of work; there are bugs,
performance issues, and missing features.

.gitignore

@@ -9,4 +9,3 @@ WebSite
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
-*.xCodeSupport/

.travis.yml

@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-    - 0.8
-before_install:
-    - jdk_switcher use openjdk6
-install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
-script: jake test
-env: PATH=/home/travis/builds/cappuccino/cappuccino/narwhal/bin:$PATH CAPP_BUILD=/home/travis/builds/cappuccino/cappuccino/Build NARWHAL_ENGINE=rhino

AppKit/AppKit.j

@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CPToolTip.j"
 @import "CALayer.j"
-@import "CGGeometry.j"
-@import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
+@import "CPAttributedString+Additions.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -38,21 +36,16 @@
 @import "CPCibBindingConnector.j"
 @import "CPCibConnector.j"
 @import "CPCibControlConnector.j"
-@import "CPCibHelpConnector.j"
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
 @import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
-@import "CPColorSpace.j"
 @import "CPColorWell.j"
-@import "CPComboBox.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
-@import "CPController.j"
 @import "CPCookie.j"
 @import "CPCursor.j"
 @import "CPDocument.j"
@@ -62,7 +55,7 @@
 @import "CPFlashView.j"
 @import "CPFont.j"
 @import "CPFontManager.j"
-@import "CPGradient.j"
+@import "CPGeometry.j"
 @import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
@@ -74,7 +67,6 @@
 @import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
-@import "CPPopover.j"
 @import "CPPopUpButton.j"
 @import "CPPredicateEditor.j"
 @import "CPPredicateEditorRowTemplate.j"
@@ -92,6 +84,7 @@
 @import "CPSound.j"
 @import "CPSplitView.j"
 @import "CPStepper.j"
+@import "CPString+Additions.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPTabView.j"
@@ -100,6 +93,7 @@
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
+@import "_CPToolTip.j"
 @import "CPTreeNode.j"
 @import "CPUserDefaultsController.j"
 @import "CPView.j"
@@ -108,4 +102,3 @@
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
-@import "CPWorkspace.j"

AppKit/CPAlert.j

@@ -75,33 +75,32 @@ CPCriticalAlertStyle        = 2;
            representing the first button added to the alert which appears on the
            right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPObject
+@implementation CPAlert : CPView
 {
-    BOOL                _showHelp               @accessors(property=showsHelp);
-    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    BOOL            _showHelp               @accessors(property=showsHelp);
+    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);
 
-    CPAlertStyle        _alertStyle             @accessors(property=alertStyle);
-    CPString            _title                  @accessors(property=title);
-    CPView              _accessoryView          @accessors(property=accessoryView);
-    CPImage             _icon                   @accessors(property=icon);
+    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
+    CPString        _title                  @accessors(property=title);
+    CPView          _accessoryView          @accessors(property=accessoryView);
+    CPImage         _icon                   @accessors(property=icon);
 
-    CPArray             _buttons                @accessors(property=buttons,readonly);
-    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton,readonly);
+    CPArray         _buttons                @accessors(property=buttons,readonly);
+    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);
 
-    id                  _delegate               @accessors(property=delegate);
-    id                  _modalDelegate;
-    SEL                 _didEndSelector;
+    id              _delegate               @accessors(property=delegate);
+    id              _modalDelegate;
+    SEL             _didEndSelector;
 
-    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
-    CPWindow            _window                 @accessors(property=window,readonly);
-    int                 _defaultWindowStyle;
+    CPWindow        _window                 @accessors(property=window,readonly);
+    int             _defaultWindowStyle;
 
-    CPImageView         _alertImageView;
-    CPTextField         _informativeLabel;
-    CPTextField         _messageLabel;
-    CPButton            _alertHelpButton;
+    CPImageView     _alertImageView;
+    CPTextField     _informativeLabel;
+    CPTextField     _messageLabel;
+    CPButton        _alertHelpButton;
 
-    BOOL                _needsLayout;
+    BOOL            _needsLayout;
 }
 
 #pragma mark Creating Alerts
@@ -118,21 +117,21 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
 {
-    var newAlert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
-    [newAlert setMessageText:aMessage];
-    [newAlert addButtonWithTitle:defaultButtonTitle];
+    [alert setMessageText:aMessage];
+    [alert addButtonWithTitle:defaultButtonTitle];
 
     if (alternateButtonTitle)
-        [newAlert addButtonWithTitle:alternateButtonTitle];
+        [alert addButtonWithTitle:alternateButtonTitle];
 
     if (otherButtonTitle)
-        [newAlert addButtonWithTitle:otherButtonTitle];
+        [alert addButtonWithTitle:otherButtonTitle];
 
     if (informativeText)
-        [newAlert setInformativeText:informativeText];
+        [alert setInformativeText:informativeText];
 
-    return newAlert;
+    return alert;
 }
 
 /*!
@@ -143,12 +142,12 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithError:(CPString)anErrorMessage
 {
-    var newAlert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
-    [newAlert setMessageText:anErrorMessage];
-    [newAlert setAlertStyle:CPCriticalAlertStyle];
+    [alert setMessageText:anErrorMessage];
+    [alert setAlertStyle:CPCriticalAlertStyle];
 
-    return newAlert;
+    return alert;
 }
 
 /*!
@@ -165,7 +164,6 @@ CPCriticalAlertStyle        = 2;
         _showHelp           = NO;
         _needsLayout        = YES;
         _defaultWindowStyle = CPTitledWindowMask;
-        _themeView          = [_CPAlertThemeView new];
 
         _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
         _alertImageView     = [[CPImageView alloc] init];
@@ -182,11 +180,6 @@ CPCriticalAlertStyle        = 2;
 
 #pragma mark Accessors
 
-- (CPTheme)theme
-{
-    return [_themeView theme];
-}
-
 /*!
     set the theme to use
 
@@ -204,20 +197,9 @@ CPCriticalAlertStyle        = 2;
 
     _window = nil; // will be regenerated at next layout
     _needsLayout = YES;
-    [_themeView setTheme:aTheme];
+    [super setTheme:aTheme];
 }
 
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
-{
-    [_themeView setValue:aValue forThemeAttribute:aName];
-}
-
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
-{
-    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
-}
-
-
 /*! @deprecated
 */
 - (void)setWindowStyle:(int)aStyle
@@ -352,16 +334,16 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutMessageView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
         sizeWithFontCorrection = 6.0,
         messageLabelWidth,
         messageLabelTextSize;
 
-    [_messageLabel setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
     [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
     messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -375,22 +357,22 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         sizeWithFontCorrection = 6.0,
         informativeLabelWidth,
         informativeLabelOriginY,
         informativeLabelTextSize;
 
-    [_informativeLabel setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
+    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
     [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
-    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
+    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
+    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin,
     informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
 
     [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
@@ -404,8 +386,8 @@ CPCriticalAlertStyle        = 2;
     if (!_accessoryView)
         return;
 
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
         accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
 
@@ -421,16 +403,16 @@ CPCriticalAlertStyle        = 2;
     if (!_showSuppressionButton)
         return;
 
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
 
-    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
     [_suppressionButton sizeToFit];
 
     [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -442,12 +424,12 @@ CPCriticalAlertStyle        = 2;
 */
 - (CGSize)_layoutButtonsFromView:(CPView)lastView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
-        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [self currentValueForThemeAttribute:@"size"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
         aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         panelSize = [[_window contentView] frame].size,
         buttonsOriginY,
         offsetX;
@@ -479,8 +461,8 @@ CPCriticalAlertStyle        = 2;
 
     if (_showHelp)
     {
-        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
             helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
             helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
 
@@ -505,7 +487,7 @@ CPCriticalAlertStyle        = 2;
     if (!_window)
         [self _createWindowWithStyle:nil];
 
-    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
         theImage = _icon,
         finalSize;
 
@@ -513,13 +495,13 @@ CPCriticalAlertStyle        = 2;
         switch (_alertStyle)
         {
             case CPWarningAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
+                theImage = [self currentValueForThemeAttribute:@"warning-image"];
                 break;
             case CPInformationalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
+                theImage = [self currentValueForThemeAttribute:@"information-image"];
                 break;
             case CPCriticalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
+                theImage = [self currentValueForThemeAttribute:@"error-image"];
                 break;
         }
 
@@ -537,7 +519,7 @@ CPCriticalAlertStyle        = 2;
     if (_showSuppressionButton)
         lastView = _suppressionButton;
     else if (_accessoryView)
-        lastView = _accessoryView;
+        lastView = _accessoryView
 
     finalSize = [self _layoutButtonsFromView:lastView];
     if ([_window styleMask] & CPDocModalWindowMask)
@@ -610,10 +592,9 @@ CPCriticalAlertStyle        = 2;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
     var frame = CGRectMakeZero();
-    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
+    frame.size = [self currentValueForThemeAttribute:@"size"];
 
     _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
-    [_window setLevel:CPStatusWindowLevel];
 
     if (_title)
         [_window setTitle:_title];
@@ -650,10 +631,7 @@ CPCriticalAlertStyle        = 2;
 - (@action)_takeReturnCodeFrom:(id)aSender
 {
     if ([_window isSheet])
-    {
-        [_window orderOut:nil];
         [CPApp endSheet:_window returnCode:[aSender tag]];
-    }
     else
     {
         [CPApp abortModal];
@@ -668,19 +646,17 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+            [_delegate alertDidEnd:self returnCode:returnCode];
+
     if (_didEndSelector)
         objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
 
     _modalDelegate = nil;
     _didEndSelector = nil;
-
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        [_delegate alertDidEnd:self returnCode:returnCode];
 }
 
-@end
-
-@implementation _CPAlertThemeView : CPView
+#pragma mark Theme Attributes
 
 + (CPString)defaultThemeClass
 {
@@ -689,63 +665,42 @@ CPCriticalAlertStyle        = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[
-                CGSizeMake(400.0, 110.0),
-                CGInsetMake(15, 15, 15, 50), 6, 10,
-                CPJustifiedTextAlignment,
-                [CPColor blackColor],
-                [CPFont boldSystemFontOfSize:13.0],
-                [CPNull null], CGSizeMakeZero(),
-                CPJustifiedTextAlignment,
-                [CPColor blackColor],
-                [CPFont systemFontOfSize:12.0],
-                [CPNull null], CGSizeMakeZero(),
-                CGPointMake(15, 12),
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                0.0,
-                0.0,
-                3.0,
-                [CPColor blackColor],
-                [CPFont systemFontOfSize:12.0],
-                [CPNull null],
-                0.0
-            ]
-            forKeys:[
-                @"size",
-                @"content-inset",
-                @"informative-offset",
-                @"button-offset",
-                @"message-text-alignment",
-                @"message-text-color",
-                @"message-text-font",
-                @"message-text-shadow-color",
-                @"message-text-shadow-offset",
-                @"informative-text-alignment",
-                @"informative-text-color",
-                @"informative-text-font",
-                @"informative-text-shadow-color",
-                @"informative-text-shadow-offset",
-                @"image-offset",
-                @"information-image",
-                @"warning-image",
-                @"error-image",
-                @"help-image",
-                @"help-image-left-offset",
-                @"help-image-pressed",
-                @"suppression-button-y-offset",
-                @"suppression-button-x-offset",
-                @"default-elements-margin",
-                @"suppression-button-text-color",
-                @"suppression-button-text-font",
-                @"suppression-button-text-shadow-color",
-                @"suppression-button-text-shadow-offset"
-            ]
-        ];
+    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
+                                                CGPointMake(15, 12),
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                3.0,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                0.0
+                                                ]
+                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
+                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
+                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
+                                                @"image-offset",
+                                                @"information-image",
+                                                @"warning-image",
+                                                @"error-image",
+                                                @"help-image",
+                                                @"help-image-left-offset",
+                                                @"help-image-pressed",
+                                                @"suppression-button-y-offset",
+                                                @"suppression-button-x-offset",
+                                                @"default-elements-margin",
+                                                @"suppression-button-text-color",
+                                                @"suppression-button-text-font",
+                                                @"suppression-button-text-shadow-color",
+                                                @"suppression-button-text-shadow-offset"
+                                                ]];
 }
 
 @end

AppKit/CPAnimation.j

@@ -122,7 +122,6 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
-    var timingFunctionName;
     switch (anAnimationCurve)
     {
         case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
@@ -308,9 +307,6 @@ ACTUAL_FRAME_RATE = 0;
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
         return [_delegate animation:self valueForProgress:t];
 
-    if (_animationCurve == CPAnimationLinear)
-        return t;
-
     var c1 = [],
         c2 = [];
 

AppKit/CPApplication.j

@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/CPRange.h"
-
 @import <Foundation/CPBundle.j>
 
 @import "CPCompatibility.j"
@@ -35,8 +33,7 @@
 
 
 var CPMainCibFile               = @"CPMainCibFile",
-    CPMainCibFileHumanFriendly  = @"Main cib file base name",
-    CPEventModifierFlags = 0;
+    CPMainCibFileHumanFriendly  = @"Main cib file base name";
 
 CPApp = nil;
 
@@ -86,7 +83,6 @@ CPRunContinuesResponse  = -1002;
     CPArray                 _eventListeners;
 
     CPEvent                 _currentEvent;
-    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -142,7 +138,9 @@ CPRunContinuesResponse  = -1002;
     {
         _eventListeners = [];
 
-        _windows = [[CPNull null]];
+        _windows = [];
+
+        [_windows addObject:nil];
     }
 
     return self;
@@ -221,22 +219,28 @@ CPRunContinuesResponse  = -1002;
     // At this point we clear the window.status to eliminate Safari's "Cancelled" error message
     // The message shouldn't be displayed, because only an XHR is cancelled, but it is a usability issue.
     // We do it here so that applications can change it in willFinish or didFinishLaunching
-#if PLATFORM(DOM)
     window.status = " ";
-#endif
 
     // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam
     [[CPCursor arrowCursor] set];
 
     var bundle = [CPBundle mainBundle],
-        delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
+        types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
+
+    if ([types count] > 0)
+        _documentController = [CPDocumentController sharedDocumentController];
+
+    var delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
 
     if (delegateClassName)
     {
         var delegateClass = objj_getClass(delegateClassName);
 
         if (delegateClass)
-            [self setDelegate:[[delegateClass alloc] init]];
+            if ([_documentController class] == delegateClass)
+                [self setDelegate:_documentController];
+            else
+                [self setDelegate:[[delegateClass alloc] init]];
     }
 
     var defaultCenter = [CPNotificationCenter defaultCenter];
@@ -245,23 +249,13 @@ CPRunContinuesResponse  = -1002;
         postNotificationName:CPApplicationWillFinishLaunchingNotification
         object:self];
 
-    var types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
-
-    if ([types count] > 0)
-        _documentController = [CPDocumentController sharedDocumentController];
-
     var needsUntitled = !!_documentController,
-        URLStrings = nil;
-
-#if PLATFORM(DOM)
-    URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings();
-#endif
-
-    var index = 0,
+        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
+        index = 0,
         count = [URLStrings count];
 
     for (; index < count; ++index)
-        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] && needsUntitled;
+        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] || needsUntitled;
 
     if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
         needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
@@ -344,7 +338,7 @@ CPRunContinuesResponse  = -1002;
     Copyright - Human readable copyright information.
     </pre>
 
-    If you choose not the include any of the above keys, they will default
+    If you choose not the include any of the above keys, they will default 
     to the following respective keys in your info.plist file.
 
     <pre>
@@ -380,7 +374,7 @@ CPRunContinuesResponse  = -1002;
             standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
 
         // FIXME move this into the CIB eventually
-        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
         [applicationLabel setAlignment:CPCenterTextAlignment];
         [versionLabel setAlignment:CPCenterTextAlignment];
         [copyrightLabel setAlignment:CPCenterTextAlignment];
@@ -582,37 +576,28 @@ CPRunContinuesResponse  = -1002;
 - (void)sendEvent:(CPEvent)anEvent
 {
     _currentEvent = anEvent;
-    CPEventModifierFlags = [anEvent modifierFlags];
 
-    var theWindow = [anEvent window];
-
-#if PLATFORM(DOM)
-    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
 
     // temporarily pretend we won't propagate the event. we'll restore the saved value later
     // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
 
     // Check if this is a candidate for key equivalent...
     if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
     {
-#if PLATFORM(DOM)
         var characters = [anEvent characters],
             modifierFlags = [anEvent modifierFlags];
 
         // Unconditionally propagate on these keys to solve browser copy paste bugs
         if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
-#endif
+            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
 
         return;
     }
 
-#if PLATFORM(DOM)
     // if we make it this far, then restore the original willPropagate value
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
 
     if (_eventListeners.length)
     {
@@ -622,16 +607,7 @@ CPRunContinuesResponse  = -1002;
         return;
     }
 
-    if ([anEvent type] == CPMouseMoved)
-    {
-        if (theWindow !== _lastMouseMoveWindow)
-            [_lastMouseMoveWindow _mouseExitedResizeRect];
-
-        _lastMouseMoveWindow = theWindow;
-    }
-
-    if (theWindow)
-        [theWindow sendEvent:anEvent];
+    [[anEvent window] sendEvent:anEvent];
 }
 
 /*!
@@ -667,10 +643,6 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
-    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
-    if (!aWindowNumber)
-        return nil;
-
     return _windows[aWindowNumber];
 }
 
@@ -679,8 +651,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    // Return all windows, but not the CPNull placeholder in _windows[0].
-    return [_windows subarrayWithRange:_CPMakeRange(1, [_windows count] - 1)];
+    return _windows;
 }
 
 /*!
@@ -955,22 +926,15 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
-    if ([aWindow isSheet])
+    var styleMask = [aSheet styleMask];
+    if (!(styleMask & CPDocModalWindowMask))
     {
-        [CPException raise:CPInternalInconsistencyException reason:@"The target window of beginSheet: cannot be a sheet"];
+        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
         return;
     }
 
-    [aSheet._windowView _enableSheet:YES];
-
-    // -dw- if a sheet is already visible, we skip this since it serves no purpose and causes
-    // orderOut: to be called on the sheet, which is not what we want.
-    if (![aWindow isVisible])
-    {
-        [aWindow orderFront:self];
-        [aSheet setPlatformWindow:[aWindow platformWindow]];
-    }
-
+    [aWindow orderFront:self];
+    [aSheet setPlatformWindow:[aWindow platformWindow]];
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
@@ -999,7 +963,7 @@ CPRunContinuesResponse  = -1002;
         if (context != nil && context["sheet"] === sheet)
         {
             context["returnCode"] = returnCode;
-            [aWindow _endSheet];
+            [aWindow _detachSheetWindow];
             return;
         }
     }
@@ -1032,15 +996,14 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)arguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    if (window && window.location && _fullArgsString !== window.location.hash)
+    if (_fullArgsString !== window.location.hash)
         [self _reloadArguments];
 
     return _args;
 }
 
 /*!
-    Sets the arguments of your application.
+    Sets the arguments of your application. 
     That is, set the slash seperated values of an array as the window location hash.
 
     For example if you pass an array:
@@ -1060,9 +1023,8 @@ CPRunContinuesResponse  = -1002;
     if (!args || args.length == 0)
     {
         _args = [];
-        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-        if (window && window.location)
-            window.location.hash = @"#";
+        window.location.hash = @"#";
+
         return;
     }
 
@@ -1077,15 +1039,12 @@ CPRunContinuesResponse  = -1002;
 
     var hash = [toEncode componentsJoinedByString:@"/"];
 
-    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-    if (window && window.location)
-        window.location.hash = @"#" + hash;
+    window.location.hash = @"#" + hash;
 }
 
 - (void)_reloadArguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    _fullArgsString = (window && window.location) ? window.location.hash : "";
+    _fullArgsString = window.location.hash;
 
     if (_fullArgsString.length)
     {
@@ -1207,12 +1166,12 @@ CPRunContinuesResponse  = -1002;
 var _CPModalSessionMake = function(aWindow, aStopCode)
 {
     return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
-};
+}
 
 var _CPEventListenerMake = function(anEventMask, aCallback)
 {
     return { _mask:anEventMask, _callback:aCallback };
-};
+}
 
 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
@@ -1222,16 +1181,9 @@ _CPRunModalLoop = function(anEvent)
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
 
-    // The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal,
-    // yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original
-    // modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working
-    // at all from sheets.
-    if (theWindow == modalSession._window ||
-        [theWindow worksWhenModal] ||
-        [theWindow attachedSheet] == modalSession._window || // -dw- allow modal parent of sheet to be repositioned
-        ([theWindow isKindOfClass:_CPAttachedWindow] && [[theWindow targetView] window] === modalSession._window))
+    if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
-};
+}
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
@@ -1246,17 +1198,7 @@ function CPApplicationMain(args, namedArgs)
 #if PLATFORM(DOM)
     // hook to allow recorder, etc to manipulate things before starting AppKit
     if (window.parent !== window && typeof window.parent._childAppIsStarting === "function")
-    {
-        try
-        {
-            window.parent._childAppIsStarting(window);
-        }
-        catch(err)
-        {
-            // This could happen if we're in an iframe without access to the parent frame.
-            CPLog.warn("Failed to call parent frame's _childAppIsStarting().");
-        }
-    }
+        window.parent._childAppIsStarting(window);
 #endif
 
     var mainBundle = [CPBundle mainBundle],
@@ -1398,8 +1340,8 @@ var _CPAppBootstrapperActions = nil;
     [editMenu addItem:undoMenuItem];
     [editMenu addItem:redoMenuItem];
 
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]];
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]];
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
     [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
 
     [editMenuItem setSubmenu:editMenu];
@@ -1428,16 +1370,3 @@ var _CPAppBootstrapperActions = nil;
 }
 
 @end
-
-
-@implementation CPEvent (CPApplicationModifierFlags)
-
-/*!
-    Returns the currently pressed modifier flags.
-*/
-+ (unsigned)modifierFlags
-{
-    return CPEventModifierFlags;
-}
-
-@end

AppKit/CPArrayController.j

@@ -564,9 +564,8 @@
 - (BOOL)setSelectionIndexes:(CPIndexSet)indexes
 {
     [self _selectionWillChange]
-    var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
+    [self __setSelectionIndexes:indexes];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -575,7 +574,7 @@
 */
 - (BOOL)__setSelectionIndex:(int)theIndex
 {
-    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
+    [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
 }
 
 /*
@@ -584,43 +583,28 @@
 */
 - (BOOL)__setSelectionIndexes:(CPIndexSet)indexes
 {
-    return [self __setSelectionIndexes:indexes avoidEmpty:_avoidsEmptySelection];
-}
+    if (!indexes)
+        indexes = [CPIndexSet indexSet];
 
-- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes avoidEmpty:(BOOL)avoidEmpty
-{
-    var newIndexes = indexes;
-
-    if (!newIndexes)
-        newIndexes = [CPIndexSet indexSet];
-
-    if (![newIndexes count])
+    if (![indexes count])
     {
-        if (avoidEmpty && [[self arrangedObjects] count])
-            newIndexes = [CPIndexSet indexSetWithIndex:0];
+        if (_avoidsEmptySelection && [[self arrangedObjects] count])
+            indexes = [CPIndexSet indexSetWithIndex:0];
     }
     else
     {
         var objectsCount = [[self arrangedObjects] count];
-
-        // Don't trash the input - the caller might depend on it or we might have been
-        // given _selectionIndexes as the input in which case the equality test below
-        // would always succeed despite our change below.
-        newIndexes = [newIndexes copy];
-
         // Remove out of bounds indexes.
-        [newIndexes removeIndexesInRange:CPMakeRange(objectsCount, [newIndexes lastIndex] + 1)];
+        [indexes removeIndexesInRange:CPMakeRange(objectsCount, [indexes lastIndex] + 1)];
         // When avoiding empty selection and the deleted selection was at the bottom, select the last item.
-        if (![newIndexes count] && avoidEmpty && objectsCount)
-            newIndexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
+        if (![indexes count] && _avoidsEmptySelection && objectsCount)
+            indexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
     }
 
-    if ([_selectionIndexes isEqualToIndexSet:newIndexes])
+    if ([_selectionIndexes isEqualToIndexSet:indexes])
         return NO;
 
-    // If we haven't already created our own index instance, make sure to copy it here so that
-    // the copy the user sent in is decoupled from our internal copy.
-    _selectionIndexes = indexes === newIndexes ? [indexes copy] : newIndexes;
+    _selectionIndexes = [indexes copy];
 
     // Push back the new selection to the model for selectionIndexes if we have one.
     // There won't be an infinite loop because of the equality check above.
@@ -652,11 +636,10 @@
     [self willChangeValueForKey:@"selectionIndexes"];
     [self _selectionWillChange];
 
-    var r = [self __setSelectedObjects:objects avoidEmpty:NO];
+    [self __setSelectedObjects:objects];
 
     [self didChangeValueForKey:@"selectionIndexes"];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -664,11 +647,6 @@
     @ignore
 */
 - (BOOL)__setSelectedObjects:(CPArray)objects
-{
-    [self __setSelectedObjects:objects avoidEmpty:_avoidsEmptySelection];
-}
-
-- (BOOL)__setSelectedObjects:(CPArray)objects avoidEmpty:(BOOL)avoidEmpty
 {
     var set = [CPIndexSet indexSet],
         count = [objects count],
@@ -682,7 +660,7 @@
             [set addIndex:index];
     }
 
-    [self __setSelectionIndexes:set avoidEmpty:avoidEmpty];
+    [self __setSelectionIndexes:set];
     return YES;
 }
 
@@ -879,9 +857,6 @@
 
         [_arrangedObjects removeObjectAtIndex:pos];
         [_selectionIndexes shiftIndexesStartingAtIndex:pos by:-1];
-
-        // This will automatically handle the avoidsEmptySelection case.
-        [self __setSelectionIndexes:_selectionIndexes];
     }
 
     [self didChangeValueForKey:@"content"];
@@ -923,15 +898,6 @@
     [self removeObjectsAtArrangedObjectIndexes:_selectionIndexes];
 }
 
-/*!
-    Removes the object at the specified index in the controller's arranged objects from the content array.
-    @param int index - index of the object to remove.
-*/
-- (void)removeObjectAtArrangedObjectIndex:(int)index
-{
-    [self removeObjectsAtArrangedObjectIndexes:[CPIndexSet indexSetWithIndex:index]];
-}
-
 /*!
     Removes the objects at the specified indexes in the controller's arranged objects from the content array.
     @param CPIndexSet indexes - indexes of the objects to remove.
@@ -946,38 +912,36 @@
     _disableSetContent = YES;
 
     var arrangedObjects = [self arrangedObjects],
+        index = [anIndexSet lastIndex],
         position = CPNotFound,
         newSelectionIndexes = [_selectionIndexes copy];
 
-    [anIndexSet enumerateIndexesWithOptions:CPEnumerationReverse
-                                 usingBlock:function(anIndex)
+    while (index !== CPNotFound)
+    {
+        var object = [arrangedObjects objectAtIndex:index];
+
+        // First try the simple case which should work if there are no sort descriptors.
+        if ([_contentObject objectAtIndex:index] === object)
+            [_contentObject removeObjectAtIndex:index];
+        else
         {
-            var object = [arrangedObjects objectAtIndex:anIndex];
+            // Since we don't have a reverse mapping between the sorted order and the
+            // unsorted one, we'll just simply have to remove an arbitrary pointer. It might
+            // be the 'wrong' one - as in not the one the user selected - but the wrong
+            // one is still just another pointer to the same object, so the user will not
+            // be able to see any difference.
+            contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
+            [_contentObject removeObjectAtIndex:contentIndex];
+        }
+        [arrangedObjects removeObjectAtIndex:index];
 
-            // First try the simple case which should work if there are no sort descriptors.
-            if ([_contentObject objectAtIndex:anIndex] === object)
-                [_contentObject removeObjectAtIndex:anIndex];
-            else
-            {
-                // Since we don't have a reverse mapping between the sorted order and the
-                // unsorted one, we'll just simply have to remove an arbitrary pointer. It might
-                // be the 'wrong' one - as in not the one the user selected - but the wrong
-                // one is still just another pointer to the same object, so the user will not
-                // be able to see any difference.
-                contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
-                [_contentObject removeObjectAtIndex:contentIndex];
-            }
-            [arrangedObjects removeObjectAtIndex:anIndex];
-
-            if (!_avoidsEmptySelection || [newSelectionIndexes count] > 1)
-            {
-                [newSelectionIndexes removeIndex:anIndex];
-                [newSelectionIndexes shiftIndexesStartingAtIndex:anIndex by:-1];
-            }
-            else if ([newSelectionIndexes lastIndex] !== anIndex)
-                [newSelectionIndexes shiftIndexesStartingAtIndex:anIndex by:-1];
-        }];
+        // Deselect this row if it was selected, and either way shift all selection indexes
+        // following it up by 1.
+        [newSelectionIndexes removeIndex:index];
+        [newSelectionIndexes shiftIndexesStartingAtIndex:index by:-1];
 
+        index = [anIndexSet indexLessThanIndex:index];
+    }
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
     _disableSetContent = NO;
@@ -1090,45 +1054,22 @@
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        isCompound = [self handlesContentAsCompoundValue],
-        dotIndex = keyPath.lastIndexOf("."),
-        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy];
+        isCompound = [self handlesContentAsCompoundValue];
 
-    if (!isCompound && !isSelectionProxy)
+    if (!isCompound)
     {
         newValue = [destination mutableArrayValueForKeyPath:keyPath];
     }
     else
     {
-        // 1. If handlesContentAsCompoundValue we cannot just set up a proxy.
+        // handlesContentAsCompoundValue == YES so we cannot just set up a proxy.
         // Every read and every write must go through transformValue and
         // reverseTransformValue, and the resulting object cannot be described by
         // a key path.
-
-        // 2. If isSelectionProxy, we don't want to proxy a proxy - that's bad
-        // for performance and won't work with markers.
-
         newValue = [destination valueForKeyPath:keyPath];
     }
 
-    var isPlaceholder = CPIsControllerMarker(newValue);
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
-
-        newValue = [self _placeholderForMarker:newValue];
-
-        // This seems to be what Cocoa does.
-        if (!newValue)
-            newValue = [CPMutableArray array];
-    }
-    else
-        newValue = [self transformValue:newValue withOptions:options];
+    newValue = [self transformValue:newValue withOptions:options];
 
     if (isCompound)
     {

AppKit/CPAttributedString+Additions.j

@@ -0,0 +1,62 @@
+/*
+ * CPAttributedString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPAttributedString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPString.
+*/
+@implementation CPAttributedString (AppKitAdditions)
+/*!
+    Draws a string in the current graphics context.
+    This method and draws the reciver on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        line = CTLineCreateWithAttributedString([self copy]);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTLineDraw(line, context);
+}
+
+/*!
+    Draws a string in the current graphics context.
+
+    @param aRect - The rect for which the string should be drawn into
+*/
+- (void)drawInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        frameSetter = CTFramesetterCreateWithAttributedString([self copy]),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [self length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+@end

AppKit/CPBezierPath.j

@@ -20,6 +20,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Copyright 2009 280 North, Inc.
+
  */
 
 @import <Foundation/CPObject.j>
@@ -165,19 +166,6 @@ var DefaultLineWidth = 1.0;
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
-- (CGRect)bounds
-{
-    // TODO: this should return this. The controlPointBounds is not a tight fit.
-    // return CGPathGetPathBoundingBox(_path);
-
-    return [self controlPointBounds];
-}
-
-- (CGRect)controlPointBounds
-{
-    return CGPathGetBoundingBox(_path);
-}
-
 /*!
     Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -285,15 +273,10 @@ var DefaultLineWidth = 1.0;
     CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }
 
-- (void)appendBezierPathWithArcFromPoint:(CGPoint)fromPoint toPoint:(CGPoint)toPoint radius:(float)radius
-{
-    CGPathAddArcToPoint(_path, null, fromPoint.x, fromPoint.y, toPoint.x, toPoint.y, radius);
-}
-
 /*!
     Append the contents of a CPBezierPath object.
 */
-- (void)appendBezierPath:(CPBezierPath)other
+- (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
@@ -306,21 +289,4 @@ var DefaultLineWidth = 1.0;
     _path = CGPathCreateMutable();
 }
 
-- (void)addClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
-- (void)setClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
 @end

AppKit/CPBox.j

@@ -35,16 +35,6 @@ CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
-// CPTitlePosition
-CPNoTitle     = 0;
-CPAboveTop    = 1;
-CPAtTop       = 2;
-CPBelowTop    = 3;
-CPAboveBottom = 4;
-CPAtBottom    = 5;
-CPBelowBottom = 6;
-
-
 /*!
     @ingroup appkit
     @class CPBox
@@ -64,10 +54,6 @@ CPBelowBottom = 6;
 
     CPSize          _contentMargin;
     CPView          _contentView;
-
-    CPString        _title @accessors(getter=title);
-    int             _titlePosition @accessors(getter=titlePosition);
-    CPTextField     _titleView;
 }
 
 + (id)boxEnclosingView:(CPView)aView
@@ -75,7 +61,6 @@ CPBelowBottom = 6;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
-    [box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
@@ -98,9 +83,6 @@ CPBelowBottom = 6;
         _borderWidth = 1.0;
         _contentMargin = CGSizeMake(0.0, 0.0);
 
-        _titlePosition = CPNoTitle;
-        _titleView = [CPTextField labelWithTitle:@""];
-
         _contentView = [[CPView alloc] initWithFrame:[self bounds]];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
@@ -295,120 +277,18 @@ CPBelowBottom = 6;
 
 - (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    var offset = [self _titleHeightOffset];
-
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    if (aTitle == _title)
-        return;
-
-    _title = aTitle;
-
-    [self _manageTitlePositioning];
-}
-
-- (void)setTitlePosition:(int)aTitlePotisition
-{
-    if (aTitlePotisition == _titlePosition)
-        return;
-
-    _titlePosition = aTitlePotisition;
-
-    [self _manageTitlePositioning];
-}
-
-- (CPFont)titleFont
-{
-    return [_titleView font];
-}
-
-- (void)setTitleFont:(CPFont)aFont
-{
-    [_titleView setFont:aFont];
-}
-
-/*!
-    Return the text field used to display the receiver's title.
-
-    This is the Cappuccino equivalent to the `titleCell` method.
-*/
-- (CPTextField)titleView
-{
-    return _titleView;
-}
-
-- (void)_manageTitlePositioning
-{
-    if (_titlePosition == CPNoTitle)
-    {
-        [_titleView removeFromSuperview];
-        [self setNeedsDisplay:YES];
-        return;
-    }
-
-    [_titleView setStringValue:_title];
-    [_titleView sizeToFit];
-    [self addSubview:_titleView];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-        case CPAboveTop:
-        case CPBelowTop:
-            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
-            [_titleView setAutoresizingMask:CPViewNotSizable];
-            break;
-
-        case CPAboveBottom:
-        case CPAtBottom:
-        case CPBelowBottom:
-            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
-            [_titleView setAutoresizingMask:CPViewMinYMargin];
-            break;
-    }
-
-    [self sizeToFit];
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
     [self setNeedsDisplay:YES];
 }
 
 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset];
+    var contentFrame = [_contentView frame];
 
-    if (!contentFrame)
-        return;
-
-    [_contentView setAutoresizingMask:CPViewNotSizable];
     [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
-    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+                                  contentFrame.size.height + _contentMargin.height * 2)];
 
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
-}
-
-- (float)_titleHeightOffset
-{
-    if (_titlePosition == CPNoTitle)
-        return [0.0, 0.0];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-            return [[_titleView frameSize].height, [_titleView frameSize].height];
-
-        case CPAtBottom:
-            return [[_titleView frameSize].height, 0.0];
-
-        default:
-            return [0.0, 0.0];
-    }
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
 }
 
 - (void)drawRect:(CPRect)rect
@@ -416,7 +296,7 @@ CPBelowBottom = 6;
     if (_borderType === CPNoBorder)
         return;
 
-    var bounds = CGRectMakeCopy([self bounds]);
+    var bounds = [self bounds];
 
     switch (_boxType)
     {
@@ -431,16 +311,6 @@ CPBelowBottom = 6;
             break;
     }
 
-    if (_titlePosition == CPAtTop)
-    {
-        bounds.origin.y += [_titleView frameSize].height;
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-    if (_titlePosition == CPAtBottom)
-    {
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-
     switch (_borderType)
     {
         case CPBezelBorder:
@@ -515,10 +385,7 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxFillColorKey     = @"CPBoxFillColorKey",
     CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
     CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
-    CPBoxTitle            = @"CPBoxTitle",
-    CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
 
 @implementation CPBox (CPCoding)
 
@@ -539,16 +406,10 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
 
         _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
 
-        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
-        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
-        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
-
         _contentView   = [self subviews][0];
 
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self _manageTitlePositioning];
     }
 
     return self;
@@ -567,10 +428,6 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
     [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
 
-    [aCoder encodeObject:_title forKey:CPBoxTitle];
-    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
-    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
-
     [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }
 

AppKit/CPBrowser.j

@@ -258,7 +258,7 @@
         var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
             view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [view setImageScaling:CPImageScaleProportionallyDown];
+        [view setImageScaling:CPScaleProportionally];
 
         [column setDataView:view];
         [column setResizingMask:CPTableColumnNoResizing];
@@ -901,12 +901,6 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }
 
-- (void)tableViewSelectionDidChange:(CPNotification)aNotification
-{
-    var selectedIndexes = [[aNotification object] selectedRowIndexes];
-    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
-}
-
 - (id)childAtIndex:(unsigned)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];
@@ -988,7 +982,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
         isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
 
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPImageScaleNone];
+    [imageView setImageScaling:CPScaleNone];
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder

AppKit/CPButton.j

@@ -29,21 +29,20 @@
 
 /* @group CPBezelStyle */
 
-                                       // IB style
-CPRoundedBezelStyle             = 1;   // Push
-CPRegularSquareBezelStyle       = 2;   // Bevel
+CPRoundedBezelStyle             = 1;
+CPRegularSquareBezelStyle       = 2;
 CPThickSquareBezelStyle         = 3;
 CPThickerSquareBezelStyle       = 4;
-CPDisclosureBezelStyle          = 5;   // Disclosure triangle
-CPShadowlessSquareBezelStyle    = 6;   // Square
-CPCircularBezelStyle            = 7;   // Round
-CPTexturedSquareBezelStyle      = 8;   // Textured
-CPHelpButtonBezelStyle          = 9;   // Help
-CPSmallSquareBezelStyle         = 10;  // Gradient
-CPTexturedRoundedBezelStyle     = 11;  // Round Textured
-CPRoundRectBezelStyle           = 12;  // Round Rect
-CPRecessedBezelStyle            = 13;  // Recessed
-CPRoundedDisclosureBezelStyle   = 14;  // Disclosure
+CPDisclosureBezelStyle          = 5;
+CPShadowlessSquareBezelStyle    = 6;
+CPCircularBezelStyle            = 7;
+CPTexturedSquareBezelStyle      = 8;
+CPHelpButtonBezelStyle          = 9;
+CPSmallSquareBezelStyle         = 10;
+CPTexturedRoundedBezelStyle     = 11;
+CPRoundRectBezelStyle           = 12;
+CPRecessedBezelStyle            = 13;
+CPRoundedDisclosureBezelStyle   = 14;
 CPHUDBezelStyle                 = -1;
 
 
@@ -112,8 +111,6 @@ CPButtonImageOffset   = 3.0;
     CPTimer             _continuousTimer;
     float               _periodicDelay;
     float               _periodicInterval;
-
-    BOOL                _isTracking;
 }
 
 + (id)buttonWithTitle:(CPString)aTitle
@@ -144,9 +141,9 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
-    @param aFrame The frame rectangle for the created button object.
-    @return An initialized CPView object or nil if the object couldn't be created.
+	Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
+	@param aFrame The frame rectangle for the created button object.
+	@return An initialized CPView object or nil if the object couldn't be created.
 */
 - (id)initWithFrame:(CGRect)aFrame
 {
@@ -158,7 +155,7 @@ CPButtonImageOffset   = 3.0;
         [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
         [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
-        [self setValue:CPImageScaleNone forThemeAttribute:@"image-scaling"];
+        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
 
         [self setBezelStyle:CPRoundRectBezelStyle];
         [self setBordered:YES];
@@ -179,13 +176,11 @@ CPButtonImageOffset   = 3.0;
     // Continuous button defaults.
     _periodicInterval   = 0.05;
     _periodicDelay      = 0.5;
-
-    [self setButtonType:CPMomentaryPushInButton];
 }
 
 // Setting the state
 /*!
-    Returns a Boolean value indicating whether the button allows a mixed state.
+	Returns a Boolean value indicating whether the button allows a mixed state.
     @return \c YES if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
@@ -211,20 +206,24 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Sets the value of the button using an Objective-J object.
-    @param anObjectValue The value of the button interpreted as an Objective-J object.
+	Sets the value of the button using an Objective-J object.
+	@param anObjectValue The value of the button interpreted as an Objective-J object.
 */
 - (void)setObjectValue:(id)anObjectValue
 {
     if (!anObjectValue || anObjectValue === @"" || ([anObjectValue intValue] === 0))
         anObjectValue = CPOffState;
+
     else if (![anObjectValue isKindOfClass:[CPNumber class]])
         anObjectValue = CPOnState;
+
     else if (anObjectValue >= CPOnState)
         anObjectValue = CPOnState
+
     else if (anObjectValue < CPOffState)
         if ([self allowsMixedState])
             anObjectValue = CPMixedState;
+
         else
             anObjectValue = CPOnState;
 
@@ -232,35 +231,24 @@ CPButtonImageOffset   = 3.0;
 
     switch ([self objectValue])
     {
-        case CPMixedState:
-            [self unsetThemeState:CPThemeStateSelected];
-            [self setThemeState:CPButtonStateMixed];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
+                            [self setThemeState:CPButtonStateMixed];
+                            break;
 
-        case CPOnState:
-            [self unsetThemeState:CPButtonStateMixed];
-            [self setThemeState:CPThemeStateSelected];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
+                            [self setThemeState:CPThemeStateSelected];
+                            break;
 
-        case CPOffState:
-            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
+        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
     }
 }
 
 /*!
-    Returns the button's next state.
-    @return The button's state. A button can have two or three states.
-    If it has two, this value is either \c CPOffState (the normal or unpressed state)
-    or \c CPOnState (the alternate or pressed state).
-    If it has three, this value can be \c CPOnState (the feature is in effect everywhere), \c CPOffState (the feature is in effect nowhere), or \c CPMixedState (the feature is in effect somewhere).
+	Returns the button's next state.
+	@return The button's state. A button can have two or three states.
+	If it has two, this value is either \c CPOffState (the normal or unpressed state)
+	or \c CPOnState (the alternate or pressed state).
+	If it has three, this value can be \c CPOnState (the feature is in effect everywhere), \c CPOffState (the feature is in effect nowhere), or \c CPMixedState (the feature is in effect somewhere).
 */
 - (CPInteger)nextState
 {
@@ -306,9 +294,9 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Sets the title displayed by the button when in its normal state.
-    @param aTitle The string to set as the button's title. This title is always shown on buttons
-    that don’t use their alternate contents when highlighting or displaying their alternate state.
+	Sets the title displayed by the button when in its normal state.
+	@param aTitle The string to set as the button's title. This title is always shown on buttons
+	that don’t use their alternate contents when highlighting or displaying their alternate state.
 */
 - (void)setTitle:(CPString)aTitle
 {
@@ -322,9 +310,9 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Returns the title displayed on the button when it’s in its normal state.
-    @return    The title displayed on the receiver when it’s in its normal state
-    or the empty string if the button doesn’t display a title.
+	Returns the title displayed on the button when it’s in its normal state.
+	@return	The title displayed on the receiver when it’s in its normal state
+	or the empty string if the button doesn’t display a title.
 */
 - (CPString)title
 {
@@ -386,19 +374,11 @@ CPButtonImageOffset   = 3.0;
 
 - (void)setShowsStateBy:(CPInteger)aMask
 {
-    // CPPushInCellMask cannot be set for showsStateBy.
-    aMask &= ~CPPushInCellMask;
-
     if (_showsStateBy === aMask)
         return;
 
     _showsStateBy = aMask;
 
-    if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask) && [self state] != CPOffState)
-        [self setThemeState:CPThemeStateHighlighted];
-    else
-        [self unsetThemeState:CPThemeStateHighlighted];
-
     [self setNeedsDisplay:YES];
     [self setNeedsLayout];
 }
@@ -422,20 +402,15 @@ CPButtonImageOffset   = 3.0;
     }
 }
 
-- (CPInteger)highlightsBy
-{
-    return _highlightsBy;
-}
-
 - (void)setButtonType:(CPButtonType)aButtonType
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
@@ -443,12 +418,12 @@ CPButtonImageOffset   = 3.0;
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
-        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
         case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
@@ -519,43 +494,20 @@ CPButtonImageOffset   = 3.0;
 
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    _isTracking = YES;
+    [self highlight:YES];
 
-    var startedTracking = [super startTrackingAt:aPoint];
-    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] == CPOffState];
-        else
-            [self highlight:YES];
-    }
-    else
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] != CPOffState];
-        else
-            [self highlight:NO];
-    }
-    return startedTracking;
+    return [super startTrackingAt:aPoint];
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    _isTracking = NO;
+    [self highlight:NO];
+    [self invalidateTimers];
+
+    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
 
     if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
         [self setNextState];
-    else
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] != CPOffState];
-        else
-            [self highlight:NO];
-    }
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-    [self invalidateTimers];
 }
 
 - (void)invalidateTimers
@@ -577,18 +529,35 @@ CPButtonImageOffset   = 3.0;
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return _CGRectInsetByInset(bounds, contentInset);
+    if (_CGInsetIsEmpty(contentInset))
+        return bounds;
+
+    bounds = _CGRectMakeCopy(bounds);
+    bounds.origin.x += contentInset.left;
+    bounds.origin.y += contentInset.top;
+    bounds.size.width -= contentInset.left + contentInset.right;
+    bounds.size.height -= contentInset.top + contentInset.bottom;
+
+    return bounds;
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
-    // Is this necessary? The theme itself can just change its inset to a zero inset when !CPThemeStateBordered.
     if (![self isBordered])
-        return bounds;
+        return _CGRectMakeZero();
 
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return _CGRectInsetByInset(bounds, bezelInset);
+    if (_CGInsetIsEmpty(bezelInset))
+        return bounds;
+
+    bounds = _CGRectMakeCopy(bounds);
+    bounds.origin.x += bezelInset.left;
+    bounds.origin.y += bezelInset.top;
+    bounds.size.width -= bezelInset.left + bezelInset.right;
+    bounds.size.height -= bezelInset.top + bezelInset.bottom;
+
+    return bounds;
 }
 
 - (CGSize)_minimumFrameSize
@@ -672,51 +641,8 @@ CPButtonImageOffset   = 3.0;
 
     if (contentView)
     {
-        var title = nil,
-            image = nil;
-
-        if (_isTracking)
-        {
-            if (_highlightsBy & CPContentsCellMask)
-            {
-                if (_showsStateBy & CPContentsCellMask)
-                {
-                    title = ([self state] == CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                    image = ([self state] == CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-                }
-                else
-                {
-                    title = [self alternateTitle];
-                    image = [self alternateImage];
-                }
-            }
-            else if (_showsStateBy & CPContentsCellMask)
-            {
-                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-            }
-            else
-            {
-                title = _title;
-                image = [self image];
-            }
-        }
-        else
-        {
-            if (_showsStateBy & CPContentsCellMask)
-            {
-                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-            }
-            else
-            {
-                title = _title;
-                image = [self image];
-            }
-        }
-
-        [contentView setText:title];
-        [contentView setImage:image];
+        [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
+        [contentView setImage:[self currentValueForThemeAttribute:@"image"]];
         [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
 
         [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
@@ -815,51 +741,9 @@ CPButtonImageOffset   = 3.0;
         return NO;
 
     [self performClick:nil];
-
     return YES;
 }
 
-/*!
-    Perform a click on the receiver.
-
-    @param sender - The sender object
-*/
-- (void)performClick:(id)sender
-{
-    // This is slightly different from [super performClick:] in that the highlight behaviour is dependent on
-    // highlightsBy and showsStateBy.
-    if (![self isEnabled])
-        return;
-
-    [self setState:[self nextState]];
-
-    var shouldHighlight = NO;
-
-    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            shouldHighlight = [self state] == CPOffState;
-        else
-            shouldHighlight = YES;
-    }
-
-    [self highlight:shouldHighlight];
-
-    try
-    {
-        [self sendAction:[self action] to:[self target]];
-    }
-    catch (e)
-    {
-        throw e;
-    }
-    finally
-    {
-        if (shouldHighlight)
-            [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
-    }
-}
-
 @end
 
 @implementation CPButton (NS)
@@ -900,9 +784,7 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
     CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
     CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
     CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
-    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
-    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
-    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";
+    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey";
 
 @implementation CPButton (CPCoding)
 
@@ -920,20 +802,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 
         _title = [aCoder decodeObjectForKey:CPButtonTitleKey];
         _alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
-        _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
 
-        if ([aCoder containsValueForKey:CPButtonHighlightsByKey])
-        {
-            // If one exists, assume both do.
-            _highlightsBy = [aCoder decodeIntForKey:CPButtonHighlightsByKey];
-            _showsStateBy = [aCoder decodeIntForKey:CPButtonShowsStateByKey];
-        }
-        else
-        {
-            // Backwards compatibility: if this CPButton was encoded before coding of
-            // highlightsBy and showsStateBy were added, we should just use the
-            // default values from _init rather than overwriting with 0, 0.
-        }
+        if ([aCoder containsValueForKey:CPButtonAllowsMixedStateKey])
+            _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
 
         [self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];
 
@@ -972,9 +843,6 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 
     [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];
 
-    [aCoder encodeInt:_highlightsBy forKey:CPButtonHighlightsByKey];
-    [aCoder encodeInt:_showsStateBy forKey:CPButtonShowsStateByKey];
-
     [aCoder encodeBool:[self imageDimsWhenDisabled] forKey:CPButtonImageDimsWhenDisabledKey];
     [aCoder encodeInt:[self imagePosition] forKey:CPButtonImagePositionKey];
 

AppKit/CPCheckBox.j

@@ -94,48 +94,54 @@ CPCheckBoxImageOffset = 4.0;
     [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
 }
 
-- (CPImage)image
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (CPImage)alternateImage
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    var startedTracking = [super startTrackingAt:aPoint];
-    [self highlight:YES];
-    return startedTracking;
-}
-
 @end
 
 @implementation _CPCheckBoxValueBinder : CPBinder
 {
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+- (void)setValueFor:(CPString)theBinding
 {
-    [super _updatePlaceholdersWithOptions:options];
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
 
-    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
-}
+    if (isPlaceholder)
+    {
+        switch (newValue)
+        {
+            case CPMultipleValuesMarker:
+                newValue = CPMixedState;
+                break;
 
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setAllowsMixedState:(aValue === CPMixedState)];
-    [_source setState:aValue];
-}
+            case CPNoSelectionMarker:
+                newValue = CPOffState;
+                break;
 
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setState:aValue];
+            case CPNotApplicableMarker:
+                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
+
+                newValue = CPOffState;
+                break;
+        }
+
+        if (newValue === CPMixedState)
+        {
+            [_source setAllowsMixedState:YES];
+        }
+        else
+        {
+            // Cocoa will always set allowsMixedState to NO
+            // This behavior will be fine for Cappuccino as well if we (like Cocoa)
+            // default the CPConditionallySetsEnabledBindingOption to YES
+            [_source setAllowsMixedState:NO];
+        }
+    }
+
+    [_source setState:newValue];
 }
 
 @end

AppKit/CPCollectionView.j

@@ -28,7 +28,7 @@
 
 @import "CPView.j"
 @import "CPCollectionViewItem.j"
-@import "CPCompatibility.j"
+
 
 /*!
     @ingroup appkit
@@ -40,23 +40,23 @@
 
     @par Delegate Methods
 
-    @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
+    @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
     Called when the selection in the collection view has changed.
     @param collectionView the collection view who's selection changed
 
-    @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+    @delegate -(void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
     Called when the user double-clicks on an item in the collection view.
     @param collectionView the collection view that received the double-click
     @param index the index of the item that received the double-click
 
-    @delegate - (CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+    @delegate -(CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
     Invoked to obtain data for a set of indices.
     @param collectionView the collection view to obtain data for
     @param indices the indices to return data for
     @param aType the data type
     @return a data object containing the index items
 
-    @delegate - (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
     Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
     @param collectionView the collection view the items reside in
     @param indices the indices to obtain drag types
@@ -242,15 +242,13 @@
     Sets the content of the collection view to the content in \c anArray.
     This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.
     It's the responsibility of your custom collection view item to interpret the object.
-
-    If the new content array is smaller than the previous one, note that [receiver selectionIndexes] may
-    refer to out of range indices. \c selectionIndexes is not changed as a result of calling the
-    \c setContent: method.
-
-    @param anArray a content array
+    @param anArray the content array
 */
 - (void)setContent:(CPArray)anArray
 {
+    // reset the _selectionIndexes
+    [self setSelectionIndexes:[CPIndexSet indexSet]];
+
     _content = anArray;
 
     [self reloadContent];
@@ -286,11 +284,9 @@
 
     if (!_isSelectable)
     {
-        var index = CPNotFound,
-            itemCount = [_items count];
+        var index = CPNotFound;
 
-        // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < itemCount)
+        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
             [_items[index] setSelected:NO];
     }
 }
@@ -344,23 +340,19 @@
 */
 - (void)setSelectionIndexes:(CPIndexSet)anIndexSet
 {
-    if (!anIndexSet)
-        anIndexSet = [CPIndexSet indexSet];
-    if (!_isSelectable || [_selectionIndexes isEqual:anIndexSet])
+    if ([_selectionIndexes isEqual:anIndexSet] || !_isSelectable)
         return;
 
-    var index = CPNotFound,
-        itemCount = [_items count];
+    var index = CPNotFound;
 
-    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound && index < itemCount)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:NO];
 
     _selectionIndexes = anIndexSet;
 
     var index = CPNotFound;
 
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
 
     var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
@@ -409,8 +401,7 @@
     }
 
     index = CPNotFound;
-    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < count)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
 
     [self tile];
@@ -482,7 +473,7 @@
     }
 
     var superview = [self superview],
-        proposedHeight = y + itemSize.height + _verticalMargin;
+        proposedHeight =  y + itemSize.height + _verticalMargin;
 
     if ([superview isKindOfClass:[CPClipView class]])
     {
@@ -568,8 +559,6 @@
 */
 - (void)setMinItemSize:(CGSize)aSize
 {
-    if (aSize === nil || aSize === undefined)
-        [CPException raise:CPInvalidArgumentException reason:"Invalid value provided for minimum size"];
     if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
 
@@ -647,9 +636,9 @@
 
     if (index >= 0 && index < _items.length)
     {
-        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPPlatformActionKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
+        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPCommandKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
         {
-            if ([anEvent modifierFlags] & CPPlatformActionKeyMask)
+            if ([anEvent modifierFlags] & CPCommandKeyMask)
             {
                 var indexes = [_selectionIndexes copy];
 
@@ -676,13 +665,6 @@
             indexes = [CPIndexSet indexSetWithIndex:index];
 
         [self setSelectionIndexes:indexes];
-
-        // TODO Is it allowable for collection view items to become the first responder? In that case they
-        // may have become that at this point by virtue of CPWindow's sendEvent: mouse down handling, and
-        // the following line will rudely snatch it away from them. For most cases though, clicking on an
-        // item should naturally make the collection view the first responder so that keyboard navigation
-        // is enabled.
-        [[self window] makeFirstResponder:self];
     }
     else if (_allowsEmptySelection)
         [self setSelectionIndexes:[CPIndexSet indexSet]];
@@ -690,10 +672,6 @@
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    // Don't crash if we never registered the intial click.
-    if (!_mouseDownEvent)
-        return;
-
     var locationInWindow = [anEvent locationInWindow],
         mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
 
@@ -987,15 +965,14 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 {
     [super awakeFromCib];
 
-    var prototypeView = [_itemPrototype view];
-    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
+    if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
     {
         var item = _itemPrototype;
 
         if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
-            _minItemSize = [prototypeView frameSize];
+            _minItemSize = [[item view] frameSize];
         else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
-            _maxItemSize = [prototypeView frameSize];
+            _maxItemSize = [[item view] frameSize];
     }
 }
 
@@ -1012,11 +989,11 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 
         _itemSize = CGSizeMakeZero();
 
-        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey];
-        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey];
+        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
+        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
 
-        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey];
-        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey];
+        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey] || 0;
+        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey] || 0;
 
         _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];
 

AppKit/CPColor.j

@@ -27,7 +27,6 @@
 @import "CPCompatibility.j"
 @import "CPImage.j"
 
-/// @cond IGNORE
 
 var _redComponent        = 0,
     _greenComponent      = 1,
@@ -55,66 +54,6 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/// @endcond
-
-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES;
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
-/*!
-    To create a simple color with a pattern image:
-
-    <code>CPColorWithImages(name, width, height{, bundle})</code>
-
-    To create a color with a three part pattern image:
-
-    <code>CPColorWithImages(slices{, orientation})</code>
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
-    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
-
-    To create a color with a nine part pattern image:
-
-    <code>CPColorWithImages(slices);</code>
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    if (arguments.length < 3)
-    {
-        var slices = arguments[0],
-            imageSlices = [];
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var slice = slices[i];
-
-            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
-        }
-
-        if (imageSlices.length === 3)
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
-        else
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-    }
-    else if (arguments.length === 3 || arguments.length === 4)
-    {
-        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
-    }
-    else
-    {
-        return nil;
-    }
-}
-
 /*!
     @ingroup appkit
 
@@ -133,7 +72,7 @@ function CPColorWithImages()
 }
 
 /*!
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -147,13 +86,13 @@ function CPColorWithImages()
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
 {
-    return [[CPColor alloc] _initWithRGBA:[MAX(0.0, MIN(1.0, red)), MAX(0.0, MIN(1.0, green)), MAX(0.0, MIN(1.0, blue)), MAX(0.0, MIN(1.0, alpha))]];
+    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
 }
 
 /*!
     @deprecated in favor of colorWithRed:green:blue:alpha:
 
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -228,12 +167,12 @@ function CPColorWithImages()
 
     switch (FLOOR(hue / 60))
     {
-        case 0: return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
-        case 1: return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
-        case 2: return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
-        case 3: return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
-        case 4: return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
-        case 5: return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
+        case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
+        case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
+        case 2: return [CPColor colorWithCalibratedRed: p green: b blue: t alpha: alpha];
+        case 3: return [CPColor colorWithCalibratedRed: p green: q blue: b alpha: alpha];
+        case 4: return [CPColor colorWithCalibratedRed: t green: p blue: b alpha: alpha];
+        case 5: return [CPColor colorWithCalibratedRed: b green: p blue: q alpha: alpha];
     }
 }
 
@@ -253,17 +192,6 @@ function CPColorWithImages()
     return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;
 }
 
-/*!
-    Creates a color in the sRGB colorspace with the given components and alpha values.
-    Values below 0.0 are treated as 0.0 and values above 1.0 are treated as 1.0.
-*/
-+ (CPColor)colorWithSRGBRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
-{
-    // TODO If Cappuccino is ported to a colorspace aware platform, this color should be in
-    // sRGBColorSpace.
-    return [self colorWithRed:red green:green blue:blue alpha:alpha];
-}
-
 /*!
     Returns a black color object. (RGBA=[0.0, 0.0, 0.0, 1.0])
 */
@@ -491,9 +419,7 @@ function CPColorWithImages()
         parts[3] ? parseFloat(parts[3], 10) : 1.0
     ];
 
-    // We can't reuse aString as _cssString because the browser might not support the `rgba` syntax, and aString might
-    // use it (issue #1413.)
-    [self _initCSSStringFromComponents];
+    _cssString = aString;
 
     return self;
 }
@@ -507,23 +433,18 @@ function CPColorWithImages()
     {
         _components = components;
 
-        [self _initCSSStringFromComponents];
+        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+            parseInt(_components[0] * 255.0) + ", " +
+            parseInt(_components[1] * 255.0) + ", " +
+            parseInt(_components[2] * 255.0) +
+            (hasAlpha ?  (", " + _components[3]) : "") + ")";
     }
 
     return self;
 }
 
-- (void)_initCSSStringFromComponents
-{
-    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-        parseInt(_components[0] * 255.0) + ", " +
-        parseInt(_components[1] * 255.0) + ", " +
-        parseInt(_components[2] * 255.0) +
-        (hasAlpha ?  (", " + _components[3]) : "") + ")";
-}
-
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {
@@ -611,14 +532,6 @@ function CPColorWithImages()
     return [[[self class] alloc] _initWithRGBA:components];
 }
 
-/*!
-    Returns the receiver. This method is a placeholder that does nothing but may be implemented in the future.
-*/
-- (CPColor)colorUsingColorSpaceName:(id)aColorSpaceName
-{
-    return self;
-}
-
 /*!
     Returns an array with the HSB values for this color.
     The index values are ordered as:
@@ -720,36 +633,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 - (CPString)description
 {
-    var description = [super description],
-        patternImage = [self patternImage];
-
-    if (!patternImage)
-        return description + " " + [self cssString];
-
-    description += " {\n";
-
-    if ([patternImage isThreePartImage] || [patternImage isNinePartImage])
-    {
-        var slices = [patternImage imageSlices];
-
-        if ([patternImage isThreePartImage])
-            description += "    orientation: " + ([patternImage isVertical] ? "vertical" : "horizontal") + ",\n";
-
-        description += "    patternImage (" + slices.length + " part): [\n";
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var imgDescription = [slices[i] description];
-
-            description += imgDescription.replace(/^/mg, "        ") + ",\n";
-        }
-
-        description = description.substr(0, description.length - 2) + "\n    ]\n}";
-    }
-    else
-        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
-
-    return description;
+    return [super description]+" "+[self cssString];
 }
 
 @end
@@ -794,10 +678,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
-/// @endcond
 
 @implementation CPColor (CPCoding)
 
@@ -828,12 +710,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 @end
 
 
-/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";
 
-/*
-    Used for the CPColor +colorWithHexString: implementation.
-    Returns an array of rgb components.
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
 */
 var hexToRGB = function(hex)
 {
@@ -871,5 +754,3 @@ var byteToHex = function(n)
     return hexCharacters.charAt((n - n % 16) / 16) +
            hexCharacters.charAt(n % 16);
 };
-
-/// @endcond

AppKit/CPColorPanel.j

@@ -51,7 +51,7 @@ CPWheelColorPickerMode = 1;
 */
 CPSliderColorPickerMode = 2;
 
-CPColorPickerViewWidth  = 265;
+CPColorPickerViewWidth  = 265,
 CPColorPickerViewHeight = 370;
 
 /*!
@@ -144,7 +144,7 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor
 {
     _color = aColor;
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     [CPApp sendAction:@selector(changeColor:) to:nil from:self];
 
@@ -299,7 +299,7 @@ CPColorPickerViewHeight = 370;
         bounds = [contentView bounds];
 
     _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
-    [_toolbar setAutoresizingMask:CPViewWidthSizable];
+    [_toolbar setAutoresizingMask: CPViewWidthSizable];
 
     var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
         leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
@@ -339,7 +339,7 @@ CPColorPickerViewHeight = 370;
 
     [previewBox addSubview:_previewView];
 
-    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
     [_previewLabel setStringValue:"Preview:"];
     [_previewLabel setTextColor:[CPColor blackColor]];
     [_previewLabel setAlignment:CPRightTextAlignment];
@@ -357,14 +357,14 @@ CPColorPickerViewHeight = 370;
 
     [swatchBox addSubview:_swatchView];
 
-    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue:"Swatches:"];
+    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue: "Swatches:"];
     [_swatchLabel setTextColor:[CPColor blackColor]];
     [_swatchLabel setAlignment:CPRightTextAlignment];
 
 
-    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue:"Opacity:"];
+    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue: "Opacity:"];
     [opacityLabel setTextColor:[CPColor blackColor]];
     [opacityLabel setAlignment:CPRightTextAlignment];
 
@@ -389,7 +389,7 @@ CPColorPickerViewHeight = 370;
     _action = nil;
     _activePicker = nil;
 
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     if (buttonForLater)
         [self _setPicker:buttonForLater];
@@ -407,13 +407,12 @@ CPColorPickerViewHeight = 370;
 
 
 CPColorDragType = "CPColorDragType";
-
 var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 /* @ignore */
 @implementation _CPColorPanelSwatches : CPView
 {
-    CPArray         _swatches;
+    CPView[]        _swatches;
     CPColor         _dragColor;
     CPColorPanel    _colorPanel;
     CPCookie        _swatchCookie;
@@ -423,13 +422,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     self = [super initWithFrame:aFrame];
 
-    [self setBackgroundColor:[CPColor grayColor]];
+    [self setBackgroundColor: [CPColor grayColor]];
 
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
 
     var whiteColor = [CPColor whiteColor];
 
-    _swatchCookie = [[CPCookie alloc] initWithName:CPColorPanelSwatchesCookie];
+    _swatchCookie = [[CPCookie alloc] initWithName: CPColorPanelSwatchesCookie];
     var colorList = [self startingColorList];
 
     _swatches = [];
@@ -437,15 +436,15 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     for (var i = 0; i < 50; i++)
     {
         // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame:CPRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame: CPRectMake(13 * i + 1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
 
         [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];
+        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
 
         [view addSubview:fillView];
 
-        [self addSubview:view];
+        [self addSubview: view];
 
         _swatches.push(view);
     }
@@ -462,7 +461,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var cookieValue = [_swatchCookie value];
 
-    if (!cookieValue)
+    if (cookieValue == "")
     {
         return [
             [CPColor blackColor],
@@ -481,7 +480,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
         result = [];
 
     for (var i = 0; i < cookieValue.length; i++)
-        result.push([CPColor colorWithHexString:cookieValue[i]]);
+        result.push([CPColor colorWithHexString: cookieValue[i]]);
 
     return result;
 }
@@ -496,7 +495,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     var future = new Date();
     future.setYear(2019);
 
-    [_swatchCookie setValue:JSON.stringify(result) expires:future domain:nil];
+    [_swatchCookie setValue: JSON.stringify(result) expires:future domain: nil];
 }
 
 - (void)setColorPanel:(CPColorPanel)panel
@@ -529,7 +528,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if (!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
-    [_colorPanel setColor:[self colorAtIndex:FLOOR(point.x / 13)] updatePicker:YES];
+    [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
@@ -546,10 +545,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
     _dragColor = [[swatch subviews][0] backgroundColor];
 
-    var bounds = CGRectMakeCopy([swatch bounds]);
+    var bounds = CPRectCreateCopy([swatch bounds]);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame:bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
 
     [dragView setBackgroundColor:[CPColor blackColor]];
@@ -557,13 +556,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:nil
-            source:self
-         slideBack:YES];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -581,7 +580,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if (![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
         return NO;
 
-    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex:FLOOR(location.x / 13)];
+    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex: FLOOR(location.x / 13)];
 }
 
 @end
@@ -636,7 +635,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     var bounds = CPRectMake(0, 0, 15, 15);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame:bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
 
     [dragView setBackgroundColor:[CPColor blackColor]];
@@ -644,13 +643,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [self dragView:dragView
-                at:CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CPPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:nil
-            source:self
-         slideBack:YES];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType

AppKit/CPColorPicker.j

@@ -44,11 +44,10 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    if (self = [super init])
-    {
-        _panel = aPanel;
-        _mask  = aMask;
-    }
+    self = [super init];
+
+    _panel = aPanel;
+    _mask  = aMask;
 
     return self;
 }
@@ -77,6 +76,7 @@
 */
 - (void)setMode:(CPColorPanelMode)mode
 {
+    return;
 }
 
 /*!
@@ -85,6 +85,7 @@
 */
 - (void)setColor:(CPColor)aColor
 {
+    return;
 }
 
 @end
@@ -109,12 +110,12 @@
 
 - (id)initView
 {
-    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
 
     _pickerView = [[CPView alloc] initWithFrame:aFrame];
     [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:_CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
 
     [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
     [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
@@ -127,9 +128,9 @@
     [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
     [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
 
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate:self];
-    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate: self];
+    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
 
     [_pickerView addSubview:_hueSaturationView];
     [_pickerView addSubview:_brightnessSlider];
@@ -224,49 +225,46 @@
 
 - (id)initWithFrame:(CPRect)aFrame
 {
-    if (self = [super initWithFrame:aFrame])
-    {
+    self = [super initWithFrame:aFrame];
+
+    var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
+
+    _wheelImage = new Image();
+    _wheelImage.src = path;
+    _wheelImage.style.position = "absolute";
+
+    path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
+
+    _blackWheelImage = new Image();
+    _blackWheelImage.src = path;
+    _blackWheelImage.style.opacity = "0";
+    _blackWheelImage.style.filter = "alpha(opacity=0)"
+    _blackWheelImage.style.position = "absolute";
+
 #if PLATFORM(DOM)
-        var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
-
-        _wheelImage = new Image();
-        _wheelImage.src = path;
-        _wheelImage.style.position = "absolute";
-
-        path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
-
-        _blackWheelImage = new Image();
-        _blackWheelImage.src = path;
-        _blackWheelImage.style.opacity = "0";
-        _blackWheelImage.style.filter = "alpha(opacity=0)"
-        _blackWheelImage.style.position = "absolute";
-
-        _DOMElement.appendChild(_wheelImage);
-        _DOMElement.appendChild(_blackWheelImage);
+    _DOMElement.appendChild(_wheelImage);
+    _DOMElement.appendChild(_blackWheelImage);
 #endif
 
-        [self setWheelSize:aFrame.size];
+    [self setWheelSize:aFrame.size];
 
-        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
-        [_crosshair setBackgroundColor:[CPColor blackColor]];
+    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_radius - 2, _radius - 2, 4, 4)];
+    [_crosshair setBackgroundColor:[CPColor blackColor]];
 
-        var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
-        [view setBackgroundColor:[CPColor whiteColor]];
+    var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
+    [view setBackgroundColor:[CPColor whiteColor]];
 
-        [_crosshair addSubview:view];
+    [_crosshair addSubview:view];
 
-        [self addSubview:_crosshair];
-    }
+    [self addSubview:_crosshair];
 
     return self;
 }
 
 - (void)setWheelBrightness:(float)brightness
 {
-#if PLATFORM(DOM)
     _blackWheelImage.style.opacity = 1.0 - brightness;
     _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
-#endif
 }
 
 - (void)setFrameSize:(CPSize)aSize
@@ -279,7 +277,6 @@
 {
     var min = MIN(aSize.width, aSize.height);
 
-#if PLATFORM(DOM)
     _blackWheelImage.style.width = min;
     _blackWheelImage.style.height = min;
     _blackWheelImage.width = min;
@@ -293,7 +290,6 @@
     _wheelImage.height = min;
     _wheelImage.style.top = (aSize.height - min) / 2.0 + "px";
     _wheelImage.style.left = (aSize.width - min) / 2.0 + "px";
-#endif
 
     _radius = min / 2.0;
 

AppKit/CPColorSpace.j

@@ -1,62 +0,0 @@
-/*
- * CPColorSpace.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-var sRGBColorSpace = nil;
-
-/*!
-    Represent color spaces.
-*/
-@implementation CPColorSpace : CPObject
-{
-    CGColorSpace _cgColorSpace;
-}
-
-/*!
-    Return an object representing the standard sRGB color space.
-*/
-+ (CPColorSpace)sRGBColorSpace
-{
-    if (!sRGBColorSpace)
-        sRGBColorSpace = [[self alloc] initWithCGColorSpace:CGColorSpaceCreateDeviceRGB()];
-    return sRGBColorSpace;
-}
-
-- (id)initWithCGColorSpace:(CGColorSpace)cgColorSpace
-{
-    if (self = [super init])
-    {
-        _cgColorSpace = cgColorSpace;
-    }
-
-    return self;
-}
-
-/*!
-    Return a Core Graphics color space representing the receiver.
-*/
-- (CGColorSpace)CGColorSpace
-{
-    return _cgColorSpace;
-}
-
-@end
-

AppKit/CPColorWell.j

@@ -43,33 +43,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     BOOL    _bordered;
 
     CPColor _color;
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding)
-        return [CPColorWellValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"colorwell";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), [CPNull null], _CGInsetMake(3.0, 3.0, 3.0, 3.0), _CGInsetMakeZero(), [CPNull null]]
-                                       forKeys:[@"bezel-inset", @"bezel-color", @"content-inset", @"content-border-inset", @"content-border-color"]];
-}
-
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"color"];
+    CPView  _wellView;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -79,8 +53,11 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     if (self)
     {
         _active = NO;
+        _bordered = YES;
         _color = [CPColor whiteColor];
-        [self setBordered:YES];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -105,23 +82,25 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
              object:[CPColorPanel sharedColorPanel]];
 }
 
-/*!
-    Sets whether the color well is bordered.
-*/
-- (void)setBordered:(BOOL)shouldBeBordered
-{
-    if (shouldBeBordered)
-        [self setThemeState:CPThemeStateBordered];
-    else
-        [self unsetThemeState:CPThemeStateBordered];
-}
-
 /*!
     Returns whether the color well is bordered
 */
 - (BOOL)isBordered
 {
-    return [self hasThemeState:CPThemeStateBordered];
+    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
@@ -144,7 +123,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     _color = aColor;
 
-    [self setNeedsLayout];
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
 /*!
@@ -207,6 +186,31 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return _active;
 }
 
+// Drawing a Color Well
+
+- (void)drawBezelWithHighlight:(BOOL)shouldHighlight
+{
+}
+
+/*!
+    Draws the colored area inside the color well without borders.
+    @param aRect the location at which to draw
+*/
+- (void)drawWellInside:(CGRect)aRect
+{
+    if (!_wellView)
+    {
+        _wellView = [[CPView alloc] initWithFrame:aRect];
+        [_wellView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        [self addSubview:_wellView];
+    }
+    else
+        [_wellView setFrame:aRect];
+
+    [_wellView setBackgroundColor:_color];
+}
+
 - (void)colorPanelDidChangeColor:(CPNotification)aNotification
 {
     [self takeColorFrom:[aNotification object]];
@@ -225,11 +229,27 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [self deactivate];
 }
 
-- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+- (void)mouseDown:(CPEvent)anEvent
 {
-    [self highlight:NO];
+    if (![self isEnabled])
+        return;
 
-    if (!mouseIsUp || !CGRectContainsPoint([self bounds], aPoint) || ![self isEnabled])
+    [self drawBezelWithHighlight:YES];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+
+    [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    [self drawBezelWithHighlight:NO];
+
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
         return;
 
     [self activate:YES];
@@ -240,115 +260,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [colorPanel orderFront:self];
 }
 
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    return _CGRectInsetByInset(bounds, contentInset);
-}
-
-- (CGRect)bezelRectForBounds:(CGRect)bounds
-{
-    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
-
-    return _CGRectInsetByInset(bounds, bezelInset);
-}
-
-- (CGRect)contentBorderRectForBounds:(CGRect)bounds
-{
-    var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];
-
-    return _CGRectInsetByInset(bounds, contentBorderInset);
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    switch (aName)
-    {
-        case "bezel-view":
-            return [self bezelRectForBounds:[self bounds]];
-        case "content-view":
-            return [self contentRectForBounds:[self bounds]];
-        case "content-border-view":
-            return [self contentBorderRectForBounds:[self bounds]];
-    }
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-
-    [view setHitTests:NO];
-
-    return view;
-}
-
-- (void)layoutSubviews
-{
-    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
-                                           positioned:CPWindowBelow
-                      relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
-                                             positioned:CPWindowAbove
-                        relativeToEphemeralSubviewNamed:@"bezel-view"];
-
-
-    [contentView setBackgroundColor:_color];
-
-    var contentBorderView = [self layoutEphemeralSubviewNamed:@"content-border-view"
-                                                   positioned:CPWindowAbove
-                              relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
-}
-
-@end
-
-@implementation CPColorWellValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var placeholderColor = [CPColor blueColor];
-
-    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
-
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
-
-        newValue = [self _placeholderForMarker:newValue];
-    }
-    else
-    {
-        newValue = [self transformValue:newValue withOptions:options];
-    }
-
-    [_source setColor:newValue];
-}
-
 @end
 
 var CPColorWellColorKey     = "CPColorWellColorKey",
@@ -367,8 +278,11 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
     if (self)
     {
         _active = NO;
+        _bordered = [aCoder decodeBoolForKey:CPColorWellBorderedKey];
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -382,10 +296,19 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 */
 - (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:[self isBordered] forKey:CPColorWellBorderedKey];
+    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
 }
 
 @end

AppKit/CPCompatibility.j

@@ -67,29 +67,13 @@ CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
 
 CPSOPDisabledFromFileURLs               = 1 << 27;
 
-// element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 1 << 28;
-
-// Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 1 << 29;
-CPInputOnInputEventFeature              = 1 << 30;
-
-// When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas
-// (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might
-// not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen.
-// This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
-
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = 0,
-    PLATFORM_BUGS                       = 0,
-    PLATFORM_STYLE_JS_PROPERTIES        = {};
+    PLATFORM_FEATURES                   = 0;
 
 // default these features to true
 
 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
-PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -115,9 +99,6 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
     PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
 
     PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
-
-    // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
 }
 
 // WebKit
@@ -154,16 +135,8 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
         PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
 
-    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
-    if (majorVersion < 537)
-        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
-
     if (USER_AGENT.indexOf("Chrome") === CPNotFound)
         PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
-
-    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
-    if (majorVersion > 533)
-        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
 }
 
 // KHTML
@@ -187,9 +160,6 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 
     if (version < 3.0)
         PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
-
-    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES |= CPInput1PxLeftPadding;
 }
 
 // Feature Specific Checks
@@ -215,16 +185,6 @@ if (typeof document != "undefined")
         PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
     else if (DOMElement.textContent != undefined)
         PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
-
-    var DOMInputElement = document.createElement("input");
-    if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
-    else if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("oninput", "return;");
-        if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
-    }
 }
 
 function CPFeatureIsCompatible(aFeature)
@@ -232,11 +192,6 @@ function CPFeatureIsCompatible(aFeature)
     return PLATFORM_FEATURES & aFeature;
 }
 
-function CPPlatformHasBug(aBug)
-{
-    return PLATFORM_BUGS & aBug;
-}
-
 function CPBrowserIsEngine(anEngine)
 {
     return PLATFORM_ENGINE === anEngine;
@@ -274,106 +229,3 @@ else
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
-
-/*!
-    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
-    CPBrowserStyleProperty('transition') -> WebkitTransition
-
-    While technically not a style property, style related event handler names are also supported.
-    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
-
-    CSS is only available in platform(dom), so don't rely too heavily on it.
-*/
-function CPBrowserStyleProperty(aProperty)
-{
-    var lowerProperty = aProperty.toLowerCase();
-
-    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
-    {
-        var r = nil;
-
-#if PLATFORM(DOM)
-        var testElement = document.createElement('div');
-
-        switch (lowerProperty)
-        {
-            case 'transitionend':
-                var candidates = {
-                        'WebkitTransition' : 'webkitTransitionEnd',
-                        'MozTransition'    : 'transitionend',
-                        'OTransition'      : 'oTransitionEnd',
-                        'msTransition'     : 'MSTransitionEnd',
-                        'transition'       : 'transitionend'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
-                break;
-            default:
-                var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    strippedProperty = aProperty.split('-').join(' '),
-                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
-
-                for (var i = 0; i < prefixes.length; i++)
-                {
-                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
-                    if (prefixes[i] + aProperty in testElement.style)
-                    {
-                        r = prefixes[i] + aProperty;
-                        break;
-                    }
-                    else if (prefixes[i] + capProperty in testElement.style)
-                    {
-                        r = prefixes[i] + capProperty;
-                        break;
-                    }
-                }
-
-                if (!r && lowerProperty in testElement.style)
-                    r = lowerProperty;
-
-                break;
-        }
-#endif
-
-        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
-    }
-
-    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
-}
-
-function CPBrowserCSSProperty(aProperty)
-{
-    var browserProperty = CPBrowserStyleProperty(aProperty);
-
-    if (!browserProperty)
-        return nil;
-
-    var prefixes = {
-            'Webkit': '-webkit-',
-            'Moz': '-moz-',
-            'O': '-o-',
-            'ms': '-ms-'
-        };
-
-    for (var prefix in prefixes)
-    {
-        if (browserProperty.substring(0, prefix.length) == prefix)
-        {
-            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
-                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
-
-            // If there were any capitalized words in the browserProperty, insert a "-" between each one
-            if (parts && parts.length > 0)
-                browserPropertyWithoutPrefix = parts.join("-");
-
-            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
-        }
-    }
-
-    var parts = browserProperty.match(/[A-Z][a-z]+/g);
-
-    if (parts && parts.length > 0)
-        browserProperty = parts.join("-");
-
-    return browserProperty.toLowerCase();
-}

AppKit/CPControl.j

@@ -20,56 +20,47 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
-@import "../Foundation/CPFormatter.j"
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
 @import "CPKeyValueBinding.j"
 
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
 
-CPRegularControlSize = 0;
-CPSmallControlSize   = 1;
-CPMiniControlSize    = 2;
+CPRegularControlSize            = 0;
+CPSmallControlSize              = 1;
+CPMiniControlSize               = 2;
 
-CPLineBreakByWordWrapping     = 0;
-CPLineBreakByCharWrapping     = 1;
-CPLineBreakByClipping         = 2;
-CPLineBreakByTruncatingHead   = 3;
-CPLineBreakByTruncatingTail   = 4;
-CPLineBreakByTruncatingMiddle = 5;
+CPLineBreakByWordWrapping       = 0;
+CPLineBreakByCharWrapping       = 1;
+CPLineBreakByClipping           = 2;
+CPLineBreakByTruncatingHead     = 3;
+CPLineBreakByTruncatingTail     = 4;
+CPLineBreakByTruncatingMiddle   = 5;
 
-CPTopVerticalTextAlignment    = 1;
-CPCenterVerticalTextAlignment = 2;
-CPBottomVerticalTextAlignment = 3;
+CPTopVerticalTextAlignment      = 1;
+CPCenterVerticalTextAlignment   = 2;
+CPBottomVerticalTextAlignment   = 3;
 
-// Deprecated for use with images, use the CPImageScale constants
-CPScaleProportionally = 0;
-CPScaleToFit          = 1;
-CPScaleNone           = 2;
+CPScaleProportionally           = 0;
+CPScaleToFit                    = 1;
+CPScaleNone                     = 2;
 
-CPImageScaleProportionallyDown     = 0;
-CPImageScaleAxesIndependently      = 1;
-CPImageScaleNone                   = 2;
-CPImageScaleProportionallyUpOrDown = 3;
+CPNoImage                       = 0;
+CPImageOnly                     = 1;
+CPImageLeft                     = 2;
+CPImageRight                    = 3;
+CPImageBelow                    = 4;
+CPImageAbove                    = 5;
+CPImageOverlaps                 = 6;
 
-CPNoImage       = 0;
-CPImageOnly     = 1;
-CPImageLeft     = 2;
-CPImageRight    = 3;
-CPImageBelow    = 4;
-CPImageAbove    = 5;
-CPImageOverlaps = 6;
-
-CPOnState    = 1;
-CPOffState   = 0;
-CPMixedState = -1;
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -91,7 +82,6 @@ var CPControlBlackColor = [CPColor blackColor];
 @implementation CPControl : CPView
 {
     id                  _value;
-    CPFormatter         _formatter @accessors(property=formatter);
 
     // Target-Action Support
     id                  _target;
@@ -112,7 +102,7 @@ var CPControlBlackColor = [CPColor blackColor];
                                                 CPTopVerticalTextAlignment,
                                                 CPLineBreakByClipping,
                                                 [CPColor blackColor],
-                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
+                                                [CPFont systemFontOfSize:12.0],
                                                 [CPNull null],
                                                 _CGSizeMakeZero(),
                                                 CPImageLeft,
@@ -134,18 +124,18 @@ var CPControlBlackColor = [CPColor blackColor];
 
 + (void)initialize
 {
-    if (self !== [CPControl class])
-        return;
+    if (self === [CPControl class])
+    {
+        [self exposeBinding:@"value"];
+        [self exposeBinding:@"objectValue"];
+        [self exposeBinding:@"stringValue"];
+        [self exposeBinding:@"integerValue"];
+        [self exposeBinding:@"intValue"];
+        [self exposeBinding:@"doubleValue"];
+        [self exposeBinding:@"floatValue"];
 
-    [self exposeBinding:@"value"];
-    [self exposeBinding:@"objectValue"];
-    [self exposeBinding:@"stringValue"];
-    [self exposeBinding:@"integerValue"];
-    [self exposeBinding:@"intValue"];
-    [self exposeBinding:@"doubleValue"];
-    [self exposeBinding:@"floatValue"];
-
-    [self exposeBinding:@"enabled"];
+        [self exposeBinding:@"enabled"];
+    }
 }
 
 + (Class)_binderClassForBinding:(CPString)theBinding
@@ -231,11 +221,10 @@ var CPControlBlackColor = [CPColor blackColor];
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [self _reverseSetBinding];
-
-    return [CPApp sendAction:anAction to:anObject from:self];
+    [CPApp sendAction:anAction to:anObject from:self];
 }
 
 - (int)sendActionOn:(int)mask
@@ -391,10 +380,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    if (mouseIsUp)
-        [self highlight:NO];
-    else
-        [self highlight:YES];
+    [self highlight:NO];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -516,46 +502,15 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined)
-    {
-        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
-
-        if (formattedValue !== nil && formattedValue !== undefined)
-            return formattedValue;
-    }
-
     return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
     Sets the receiver's string value.
 */
-- (void)setStringValue:(CPString)aString
+- (void)setStringValue:(CPString)anObject
 {
-    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
-    if (aString === nil || aString === undefined)
-    {
-        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
-        return;
-    }
-
-    var value;
-
-    if (_formatter)
-    {
-        value = nil;
-
-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
-        {
-            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;  // Means the value is invalid
-        }
-    }
-    else
-        value = aString;
-
-    [self setObjectValue:value];
+    [self setObjectValue:anObject];
 }
 
 - (void)takeDoubleValueFrom:(id)sender
@@ -571,18 +526,21 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setFloatValue:[sender floatValue]];
 }
 
+
 - (void)takeIntegerValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(integerValue)])
         [self setIntegerValue:[sender integerValue]];
 }
 
+
 - (void)takeIntValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(intValue)])
         [self setIntValue:[sender intValue]];
 }
 
+
 - (void)takeObjectValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(objectValue)])
@@ -793,10 +751,9 @@ var CPControlBlackColor = [CPColor blackColor];
     Sets the image scaling of the control.
 
     <pre>
-    CPImageScaleProportionallyDown
-    CPImageScaleAxesIndependently
-    CPImageScaleNone
-    CPImageScaleProportionallyUpOrDown
+    CPScaleProportionally
+    CPScaleToFit
+    CPScaleNone
     </pre>
 */
 - (void)setImageScaling:(CPImageScaling)scaling
@@ -867,16 +824,17 @@ var CPControlBlackColor = [CPColor blackColor];
 
 @end
 
-var CPControlValueKey                   = @"CPControlValueKey",
-    CPControlControlStateKey            = @"CPControlControlStateKey",
-    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
-    CPControlTargetKey                  = @"CPControlTargetKey",
-    CPControlActionKey                  = @"CPControlActionKey",
-    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
-    CPControlFormatterKey               = @"CPControlFormatterKey",
-    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
+var CPControlValueKey           = "CPControlValueKey",
+    CPControlControlStateKey    = @"CPControlControlStateKey",
+    CPControlIsEnabledKey       = "CPControlIsEnabledKey",
 
-    __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
+    CPControlTargetKey          = "CPControlTargetKey",
+    CPControlActionKey          = "CPControlActionKey",
+    CPControlSendActionOnKey    = "CPControlSendActionOnKey",
+
+    CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey";
+
+var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
 @implementation CPControl (CPCoding)
 
@@ -899,8 +857,6 @@ var CPControlValueKey                   = @"CPControlValueKey",
 
         [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
         [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
-
-        [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
     }
 
     return self;
@@ -926,13 +882,10 @@ var CPControlValueKey                   = @"CPControlValueKey",
     if (_target !== nil)
         [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
 
-    if (_action !== nil)
+    if (_action !== NULL)
         [aCoder encodeObject:_action forKey:CPControlActionKey];
 
     [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];
-
-    if (_formatter !== nil)
-        [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
 }
 
 @end

AppKit/CPCookie.j

@@ -94,7 +94,7 @@
         domain = "";
 
 #if PLATFORM(DOM)
-    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
+    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
 #else
     _cookieValue = value;
     _expires = expires;
@@ -111,12 +111,8 @@
     for (var i = 0; i < ca.length; i++)
     {
         var c = ca[i];
-
-        while (c.charAt(0) == ' ')
-            c = c.substring(1, c.length);
-
-        if (c.indexOf(nameEQ) == 0)
-            return c.substring(nameEQ.length, c.length);
+        while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
     }
 #endif
     return "";

AppKit/CPCursor.j

@@ -25,8 +25,7 @@ Cursor support by browser:
 
 var currentCursor = nil,
     cursorStack = [],
-    cursors = {},
-    ieCursorMap = {};
+    cursors = {};
 
 @implementation CPCursor : CPObject
 {
@@ -37,20 +36,6 @@ var currentCursor = nil,
     BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }
 
-+ (void)initialize
-{
-    if (self !== CPCursor)
-        return;
-
-    // IE < 9 does not support some CSS cursors, we map them to supported ones
-    ieCursorMap = {
-        "ew-resize":   "e-resize",
-        "ns-resize":   "n-resize",
-        "nesw-resize": "ne-resize",
-        "nwse-resize": "nw-resize"
-    };
-}
-
 - (id)initWithCSSString:(CPString)aString
 {
     if (self = [super init])
@@ -59,30 +44,23 @@ var currentCursor = nil,
     return self;
 }
 
-/*!
-    Init a cursor with the given image and hotspot.
-    hotspot is supported in CSS3 (but not IE).
-*/
-- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
+// hotspot is supported in CSS3 (but not IE).
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
 {
     _hotSpot = hotSpot;
     _image = image;
     return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }
 
-/*!
-    Init a cursor with the given image and hotspot. This is provided
-    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
-    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-*/
-- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
+// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
+- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
 {
     return [self initWithImage:image hotSpot:hotSpot];
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }
 
 + (void)unhide
@@ -143,7 +121,6 @@ var currentCursor = nil,
 {
 #if PLATFORM(DOM)
     var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-
     for (var i = 0, count = [platformWindows count]; i < count; i++)
         platformWindows[i]._DOMBodyElement.style.cursor = aString;
 #endif
@@ -153,34 +130,22 @@ var currentCursor = nil,
 + (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
 {
     var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
+    if (typeof cursor === 'undefined')
     {
         var cssString;
-
         if (doesHaveImage)
-            cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString];
+            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
         else
-        {
-            // IE <= 8 does not support some cursors, map them to supported cursors
-            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
-
-            if (ieLessThan9)
-                cssString = ieCursorMap[aString] || aString;
-            else
-                cssString = aString;
-        }
-
+            cssString = aString
         cursor = [[CPCursor alloc] initWithCSSString:cssString];
         cursors[cursorName] = cursor;
     }
-
     return cursor;
 }
 
 + (CPCursor)arrowCursor
 {
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
 }
 
 + (CPCursor)crosshairCursor
@@ -198,36 +163,6 @@ var currentCursor = nil,
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
 }
 
-+ (CPCursor)resizeNorthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthwestSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeDownCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
@@ -253,21 +188,11 @@ var currentCursor = nil,
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
 }
 
-+ (CPCursor)resizeEastWestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeUpDownCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
 }
 
-+ (CPCursor)resizeNorthSouthCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
-}
-
 + (CPCursor)operationNotAllowedCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];

AppKit/CPDocument.j

@@ -922,9 +922,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-};
+}
 
 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
     return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-};
+}

AppKit/CPEvent.j

@@ -179,8 +179,7 @@ CPDOMEventTouchCancel                   = "touchcancel";
 
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
-    _CPEventStartupMilliseconds         = new Date().getTime();
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
 
 /*!
     @ingroup appkit
@@ -204,22 +203,12 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _isARepeat;
     unsigned            _keyCode;
     DOMEvent            _DOMEvent;
-    int                 _data1;
-    int                 _data2;
 
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
 }
 
-/*!
-    Returns the current time in fractional seconds since startup.
-*/
-+ (CPTimeInterval)currentTimestamp
-{
-    return (new Date().getTime() - _CPEventStartupMilliseconds) / 1000;
-}
-
 /*!
     Creates a new keyboard event.
 
@@ -400,7 +389,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the time the event occurred in seconds since startup.
+    Returns the time the event occurred.
 */
 - (CPTimeInterval)timestamp
 {
@@ -519,16 +508,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _DOMEvent;
 }
 
-- (int)data1
-{
-    return _data1;
-}
-
-- (int)data2
-{
-    return _data2;
-}
-
 // Getting Scroll Wheel Event Information
 /*!
     Returns the change in the x-axis for a mouse event.
@@ -592,27 +571,31 @@ var _CPEventPeriodicEventPeriod         = 0,
     if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
         return YES;
 
-    // Cocoa allows almost any key as a key equivalent unless the first responder is a
-    // text field (presumably a subclass of NSText.)
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
-    // Some keys are accepted as key equivalents even if the first responder is a text
-    // field.
     for (var i = 0; i < characterCount; i++)
     {
-        var c = _characters.charAt(i);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
+        switch (_characters.charAt(i))
         {
-            return YES;
+            case CPBackspaceCharacter:
+            case CPDeleteCharacter:
+            case CPDeleteFunctionKey:
+            case CPTabCharacter:
+            case CPCarriageReturnCharacter:
+            case CPNewlineCharacter:
+            case CPSpaceFunctionKey:
+            case CPEscapeFunctionKey:
+            case CPPageUpFunctionKey:
+            case CPPageDownFunctionKey:
+            case CPLeftArrowFunctionKey:
+            case CPUpArrowFunctionKey:
+            case CPRightArrowFunctionKey:
+            case CPDownArrowFunctionKey:
+            case CPEndFunctionKey:
+            case CPHomeFunctionKey:
+                return YES;
         }
     }
-
-    return !firstResponderIsText;
+    // FIXME: More cases?
+    return NO;
 }
 
 /*!
@@ -642,34 +625,11 @@ var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer = nil;
 }
 
-- (CPString)description
-{
-    switch (_type)
-    {
-        case CPKeyDown:
-        case CPKeyUp:
-        case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
-        case CPLeftMouseDown:
-        case CPLeftMouseUp:
-        case CPRightMouseDown:
-        case CPRightMouseUp:
-        case CPMouseMoved:
-        case CPLeftMouseDragged:
-        case CPRightMouseDragged:
-        case CPMouseEntered:
-        case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
-        default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
-    }
-}
-
 @end
 
 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }
 
 var CPEventClass = [CPEvent class];
@@ -691,3 +651,4 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
+

AppKit/CPFlashView.j

@@ -104,10 +104,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
     var varString = @"",
-        enumerator = [aDictionary keyEnumerator],
-        key;
+        enumerator = [aDictionary keyEnumerator];
 
-    while ((key = [enumerator nextObject]) !== nil)
+    var key;
+    while (key = [enumerator nextObject])
         varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
 
     if (!_params)
@@ -146,7 +146,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         var enumerator = [_params keyEnumerator],
             key;
 
-        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
+        while (_DOMObjectElement && (key = [enumerator nextObject]))
         {
             var param = document.createElement(@"param");
             param.name = key;
@@ -178,7 +178,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         paramEnumerator = [_params keyEnumerator],
         key;
 
-    while ((key = [paramEnumerator nextObject]) !== nil)
+    while (key = [paramEnumerator nextObject])
         paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
 
     _DOMObjectElement = document.createElement(@"object");

AppKit/CPFont.j

@@ -28,85 +28,46 @@
 CPFontDefaultSystemFontFace = @"Arial, sans-serif";
 CPFontDefaultSystemFontSize = 12;
 
-/*!
-    To create a font of a size that will dynamically reflect the current
-    system font size, use this for the size argument.
-*/
-CPFontCurrentSystemSize = -1;
-
-// For internal use only by this class and subclasses
-_CPFontSystemFacePlaceholder = "_CPFontSystemFacePlaceholder";
-
-var _CPFontCache                     = {},
-    _CPSystemFontCache               = {},
-    _CPFontSystemFontFace            = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize            = 12,
-    _CPFontFallbackFaces             = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp               = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
+var _CPFonts                        = {},
+    _CPFontSystemFontFace           = CPFontDefaultSystemFontFace,
+    _CPFontSystemFontSize           = 12,
+    _CPFontFallbackFaces            = CPFontDefaultSystemFontFace.split(", "),
+    _CPFontStripRegExp              = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
 
 
-#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
 #define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
-#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
-
-#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
-#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
-#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])
+#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFonts[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
 
 /*!
-@ingroup appkit
-@class CPFont
+    @ingroup appkit
+    @class CPFont
 
-The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
-The primary method for getting a particular font is through one of the class methods that take
-a name and/or size as arguments, and return the appropriate CPFont.
+    The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
+    The primary method for getting a particular font is through one of the class methods that take
+    a name and/or size as arguments, and return the appropriate CPFont.
 
-### System fonts
-When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
-created that always refers to the current system font face and size. By default the system
-font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
-runtime in two ways:
+    By default the system font face/size is Arial 12px, with a fallback to sans-serif. You may
+    configure this at runtime in two ways:
 
-- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
-  Note that if you change the system font face or size during runtime, the next time
-  any view using a system font is redrawn, it will show the new font.
-- By configuring Info.plist for your application or for AppKit. You can set the font face
-  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-  by adding a CPSystemFontSize integer item to the Info.plist.
+    - By sending [CPFont @link CPFont::setSystemFontFace: setSystemFontFace:@endlink] and/or [CPFont @link CPFont::setSystemFontSize: setSystemFontSize:@endlink].
+    - By configuring Info.plist for your application or for AppKit. You can set the font face
+      by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
+      by adding a CPSystemFontSize integer item to the Info.plist.
 
-Note that in either case, you can specify a comma-delimited list of fonts as the font face.
-Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
-representation of a font is requested.
+    Note that in either case, you can specify a comma-delimited list of fonts as the font face.
+    The browser will use the first available font in the list. CPFont always ensures that Arial
+    and sans-serif are in the generated CSS string, so there is no need to add them to the end
+    of your font list.
 
-The browser will use the first available font in the list you supply. CPFont always ensures
-that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
-no need to add them to the end of your font list.
+    If you are using nib2cib, you should use the second method (using Info.plist),
+    and be sure to run nib2cib again any time you modify the CPSystemFontFace or CPSystemFontSize items.
+    For example, you might add this to your application's Info.plist to set the system font to Lucida Grande,
+    with an automatic fallback to Arial or sans-serif:
 
-### nib2cib conversion
-Fonts are converted by nib2cib according to the following algorithm:
-
-- If the font family is Lucida Grande, then a system font will be created.
-- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
-  The default font is taken from the "font" theme attribute if one exists,
-  otherwise from the current system font face and size.
-- Lucida Grande of any size other than 13 will retain its size.
-- Fonts using any family other than Lucida Grande will be used as is, including the size.
-
-### Using custom web fonts
-The configurability of CPFont makes it easy to use a custom web font as the system font.
-For example, if you want to use the google font Asap as the system font, you would do the
-following:
-
-- Add a <link> to the <head> of index-debug.html and index.html:
-@code
-<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
-@endcode
-- Specify Asap as the system font in Info.plist by adding the following item:
-@code
+    @code
 <key>CPSystemFontFace</key>
-<string>Asap</string>
-@endcode
+<string>Lucida Grande</string>
+	@endcode
 */
 @implementation CPFont : CPObject
 {
@@ -117,23 +78,19 @@ following:
     float       _lineHeight;
     BOOL        _isBold         @accessors(readonly, getter=isBold);
     BOOL        _isItalic       @accessors(readonly, getter=isItalic);
-    BOOL        _isSystem       @accessors(readonly, getter=isSystem);
 
     CPString    _cssString;
 }
 
 + (void)initialize
 {
-    if (self !== [CPFont class])
-        return;
-
     var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
 
     if (!systemFontFace)
         systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];
 
     if (systemFontFace)
-        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
+        [self setSystemFontFace:systemFontFace];
 
     var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
 
@@ -157,13 +114,7 @@ following:
 */
 + (CPString)setSystemFontFace:(CPString)aFace
 {
-    var normalizedFaces = _CPFontNormalizedNames(aFace);
-
-    if (normalizedFaces === _CPFontSystemFontFace)
-        return;
-
-    [self _invalidateSystemFontCache]
-    _CPFontSystemFontFace = aFace;
+    _CPFontSystemFontFace = _CPFontNormalizedNames(aFace);
 }
 
 /*!
@@ -174,156 +125,106 @@ following:
     return _CPFontSystemFontSize;
 }
 
-+ (float)systemFontSizeForControlSize:(CPControlSize)aSize
-{
-    // TODO These sizes should be themable or made less arbitrary in some other way.
-    switch (aSize)
-    {
-        case CPSmallControlSize:
-            return _CPFontSystemFontSize - 1;
-        case CPMiniControlSize:
-            return _CPFontSystemFontSize - 2;
-        case CPRegularControlSize:
-        default:
-            return _CPFontSystemFontSize;
-    }
-}
-
 /*!
     Sets the default system font size.
 */
 + (float)setSystemFontSize:(float)size
 {
-    if (size > 0 && size !== _CPFontSystemFontSize)
-    {
-        [self _invalidateSystemFontCache];
+    if (size > 0)
         _CPFontSystemFontSize = size;
-    }
-}
-
-+ (void)_invalidateSystemFontCache
-{
-    var systemSize = String(_CPFontSystemFontSize),
-        currentSize = String(CPFontCurrentSystemSize);
-
-    for (key in _CPSystemFontCache)
-    {
-        if (_CPSystemFontCache.hasOwnProperty(key) &&
-            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
-        {
-            delete _CPSystemFontCache[key];
-        }
-    }
 }
 
 /*!
     Returns a font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:NO];
 }
 
 /*!
     Returns a font with the specified name, size and style.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @param italic whether the font should be italicized
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:italic];
 }
 
 /*!
     Returns a bold font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
+    return _CPCachedFont(aName, aSize, YES, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:NO];
 }
 
 /*!
     Returns a bold font with the specified name, size and style.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @param italic whether the font should be italicized
     @return the requested font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
-}
-
-/*!
-    Internal font getter like fontWithName:size:italic: with a bold selector.
-*/
-+ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:italic];
 }
 
 /*!
     Returns the system font scaled to the specified size
-    @param aSize the size of the font (in px). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested system font
 */
 + (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO italic:NO];
 }
 
 /*!
     Returns the bold system font scaled to the specified size
-    @param aSize the size of the font (in px). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested bold system font
 */
 + (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES italic:NO];
 }
 
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
+/*  FIXME Font Descriptor
+    @ignore
+*/
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
+{
+    return [self _initWithName:aName size:aSize bold:isBold italic:NO];
+}
+
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic
 {
     self = [super init];
 
     if (self)
     {
+        _name = _CPFontNormalizedNames(aName);
         _size = aSize;
         _ascender = 0;
         _descender = 0;
         _lineHeight = 0;
         _isBold = isBold;
         _isItalic = isItalic;
-        _isSystem = isSystem;
 
-        if (isSystem)
-        {
-            _name = aName;
-            _cssString = _CPFontCreateCSSString(_CPFontSystemFontFace, _size, _isBold, _isItalic);
-            _CPSystemFontCache[_CPSystemFontCacheKey(_size, _isBold)] = self;
-        }
-        else
-        {
-            _name = _CPFontNormalizedNames(aName);
-            _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
-            _CPFontCache[_cssString] = self;
-        }
+        _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
+
+        _CPFonts[_cssString] = self;
     }
 
     return self;
@@ -334,12 +235,10 @@ following:
 */
 - (float)ascender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_ascender)
+        [self _getMetrics];
 
-    if (!font._ascender)
-        [font _getMetrics];
-
-    return font._ascender;
+    return _ascender;
 }
 
 /*!
@@ -348,12 +247,10 @@ following:
 */
 - (float)descender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_descender)
+        [self _getMetrics];
 
-    if (!font._descender)
-        [font _getMetrics];
-
-    return font._descender;
+    return _descender;
 }
 
 /*!
@@ -363,12 +260,10 @@ following:
 */
 - (float)defaultLineHeightForFont
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_lineHeight)
+        [self _getMetrics];
 
-    if (!font._lineHeight)
-        [font _getMetrics];
-
-    return font._lineHeight;
+    return _lineHeight;
 }
 
 /*!
@@ -376,7 +271,7 @@ following:
 */
 - (float)size
 {
-    return _CPRealFontSize(_size);
+    return _size;
 }
 
 /*!
@@ -384,9 +279,7 @@ following:
 */
 - (CPString)cssString
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    return font._cssString;
+    return _cssString;
 }
 
 /*!
@@ -394,17 +287,9 @@ following:
 */
 - (CPString)familyName
 {
-    if (_isSystem)
-        return _CPFontSystemFontFace;
-
     return _name;
 }
 
-- (BOOL)isSystemSize
-{
-    return _size <= 0;
-}
-
 - (BOOL)isEqual:(id)anObject
 {
     return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
@@ -417,7 +302,7 @@ following:
 
 - (id)copy
 {
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
+    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic];
 }
 
 - (void)_getMetrics
@@ -434,8 +319,7 @@ following:
 var CPFontNameKey     = @"CPFontNameKey",
     CPFontSizeKey     = @"CPFontSizeKey",
     CPFontIsBoldKey   = @"CPFontIsBoldKey",
-    CPFontIsItalicKey = @"CPFontIsItalicKey",
-    CPFontIsSystemKey = @"CPFontIsSystemKey";
+    CPFontIsItalicKey = @"CPFontIsItalicKey";
 
 @implementation CPFont (CPCoding)
 
@@ -449,10 +333,9 @@ var CPFontNameKey     = @"CPFontNameKey",
     var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
         size = [aCoder decodeFloatForKey:CPFontSizeKey],
         isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
-        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
-        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
+        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey];
 
-    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
+    return [self _initWithName:fontName size:size bold:isBold italic:isItalic];
 }
 
 /*!
@@ -465,7 +348,6 @@ var CPFontNameKey     = @"CPFontNameKey",
     [aCoder encodeFloat:_size forKey:CPFontSizeKey];
     [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
     [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
-    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }
 
 @end
@@ -474,7 +356,7 @@ var CPFontNameKey     = @"CPFontNameKey",
 // aName must be normalized
 var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
 {
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
+    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + aSize + "px ";
 
     return properties + _CPFontConcatNameWithFallback(aName);
 };

AppKit/CPFontManager.j

@@ -24,19 +24,6 @@
 
 @import "CPFont.j"
 
-CPItalicFontMask                    = 1 << 0;
-CPBoldFontMask                      = 1 << 1;
-CPUnboldFontMask                    = 1 << 2;
-CPNonStandardCharacterSetFontMask   = 1 << 3;
-CPNarrowFontMask                    = 1 << 4;
-CPExpandedFontMask                  = 1 << 5;
-CPCondensedFontMask                 = 1 << 6;
-CPSmallCapsFontMask                 = 1 << 7;
-CPPosterFontMask                    = 1 << 8;
-CPCompressedFontMask                = 1 << 9;
-CPFixedPitchFontMask                = 1 << 10;
-CPUnitalicFontMask                  = 1 << 24;
-
 
 var CPSharedFontManager     = nil,
     CPFontManagerFactory    = Nil;
@@ -46,17 +33,7 @@ var CPSharedFontManager     = nil,
 */
 @implementation CPFontManager : CPObject
 {
-    CPArray         _availableFonts;
-
-    id              _target @accessors(property=target);
-    SEL             _action @accessors(property=action);
-
-    id              _delegate @accessors(property=delegate);
-
-    CPFont          _selectedFont;
-    BOOL            _multiple @accessors;
-
-    CPDictionary    _activeChange;
+    CPArray _availableFonts;
 }
 
 // Getting the Shared Font Manager
@@ -82,16 +59,6 @@ var CPSharedFontManager     = nil,
     CPFontManagerFactory = aClass;
 }
 
-- (id)init
-{
-    if (self = [super init])
-    {
-        _action = @selector(changeFont:);
-    }
-
-    return self;
-}
-
 /*!
     Returns an array of the available fonts
 */
@@ -99,9 +66,6 @@ var CPSharedFontManager     = nil,
 {
     if (!_availableFonts)
     {
-        _availableFonts = [];
-
-#if PLATFORM(DOM)
         _CPFontDetectSpan = document.createElement("span");
         _CPFontDetectSpan.fontSize = "24px";
         _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -113,16 +77,13 @@ var CPSharedFontManager     = nil,
 
         _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
 
+        _availableFonts = [];
         for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
         {
             var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
             if (available)
                 _availableFonts.push(_CPFontDetectAllFonts[i]);
         }
-#else
-        // If there's no font detection, just assume all fonts are available.
-        _availableFonts = _CPFontDetectAllFonts;
-#endif
     }
     return _availableFonts;
 }
@@ -136,128 +97,43 @@ var CPSharedFontManager     = nil,
     return _CPFontDetectFontAvailable(aFontName);
 }
 
-- (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
-{
-    _selectedFont = aFont;
-    _isMultiple = aFlag;
-
-    // TODO Notify CPFontPanel when it exists.
-}
-
-- (CPFont)selectedFont
-{
-    return _selectedFont;
-}
-
-- (BOOL)isMultiple
-{
-    return _isMultiple;
-}
-
-- (int)weightOfFont:(CPFont)aFont
-{
-    // TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
-    // precise than that.
-    return [aFont isBold] ? 9 : 5;
-}
-
-- (CPFontTraitMask)traitsOfFont:(CPFont)aFont
-{
-    return ([aFont isBold] ? CPBoldFontMask : 0) | ([aFont isItalic] ? CPItalicFontMask : 0);
-}
-
-- (CPFont)convertFont:(CPFont)aFont
-{
-    if (!_activeChange)
-        return aFont;
-
-    var addTraits = [_activeChange valueForKey:@"addTraits"];
-
-    if (addTraits)
-        aFont = [self convertFont:aFont toHaveTrait:addTraits];
-
-    return aFont;
-}
-
-- (CPFont)convertFont:(CPFont)aFont toHaveTrait:(CPFontTraitMask)addTraits
-{
-    if (!aFont)
-        return nil;
-
-    var shouldBeBold = ([aFont isBold] || (addTraits & CPBoldFontMask)) && !(addTraits & CPUnboldFontMask),
-        shouldBeItalic = ([aFont isItalic] || (addTraits & CPItalicFontMask)) && !(addTraits & CPUnitalicFontMask),
-        shouldBeSize = [aFont size];
-
-    // XXX On the current platform there will always be a bold/italic version of each font, but still leave
-    // || aFont in here for future platforms.
-    aFont = [CPFont _fontWithName:[aFont familyName] size:shouldBeSize bold:shouldBeBold italic:shouldBeItalic] || aFont;
-
-    return aFont;
-}
-
-- (CPFont)convertFont:(CPFont)aFont toFace:(CPString)aTypeface
-{
-    if (!aFont)
-        return nil;
-
-    var shouldBeBold = [aFont isBold],
-        shouldBeItalic = [aFont isItalic],
-        shouldBeSize = [aFont size];
-
-    aFont = [CPFont _fontWithName:aTypeface size:shouldBeSize bold:shouldBeBold italic:shouldBeItalic] || aFont;
-
-    return aFont;
-}
-
-- (@action)addFontTrait:(id)sender
-{
-    _activeChange = [CPDictionary dictionaryWithObject:[sender tag] forKey:@"addTraits"];
-
-    [self sendAction];
-}
-
-- (BOOL)sendAction
-{
-    return [CPApp sendAction:_action to:_target from:self];
-}
-
 @end
 
 var _CPFontDetectSpan,
     _CPFontDetectReferenceFonts,
     _CPFontDetectAllFonts = [
-        /* "04b_21", "A Charming Font", "Abadi MT Condensed", "Abadi MT Condensed Extra Bold", "Abadi MT Condensed Light", "Academy Engraved LET", "Agency FB", "Alba", "Alba Matter", "Alba Super", "Algerian",*/
+        /* "04b_21","A Charming Font","Abadi MT Condensed","Abadi MT Condensed Extra Bold","Abadi MT Condensed Light","Academy Engraved LET","Agency FB","Alba","Alba Matter","Alba Super","Algerian",*/
         "American Typewriter",
-        /* "Andale Mono", "Andale Mono IPA", "Andy", */
-        "Apple Chancery", "Arial", "Arial Black", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS",
-        /* "Avant Garde", "Avantgarde", "Baby Kruffy", "Base 02", "Baskerville", "Baskerville Old Face", "Bauhaus 93", "Beesknees ITC", "Bell MT", "Berlin Sans FB", "Berlin Sans FB Demi", "Bernard MT Condensed", "Bickley Script",*/
-        "Big Caslon", "Bitstream Vera Sans", "Bitstream Vera Sans Mono", "Bitstream Vera Serif",
-        /* "Blackadder ITC", "Blackletter686 BT", "Bodoni MT", "Bodoni MT Black", "Bodoni MT Condensed", "Bodoni MT Poster Compressed", "Book Antiqua", "Bookman", "Bookman Old Style", "Bradley Hand ITC", "Braggadocio", "Britannic Bold", "Broadway", "Broadway BT",*/
+        /* "Andale Mono","Andale Mono IPA","Andy", */
+        "Apple Chancery","Arial","Arial Black","Arial Narrow","Arial Rounded MT Bold","Arial Unicode MS",
+        /* "Avant Garde","Avantgarde","Baby Kruffy","Base 02","Baskerville","Baskerville Old Face","Bauhaus 93","Beesknees ITC","Bell MT","Berlin Sans FB","Berlin Sans FB Demi","Bernard MT Condensed","Bickley Script",*/
+        "Big Caslon","Bitstream Vera Sans","Bitstream Vera Sans Mono","Bitstream Vera Serif",
+        /* "Blackadder ITC","Blackletter686 BT","Bodoni MT","Bodoni MT Black","Bodoni MT Condensed","Bodoni MT Poster Compressed","Book Antiqua","Bookman","Bookman Old Style","Bradley Hand ITC","Braggadocio","Britannic Bold","Broadway","Broadway BT",*/
         "Brush Script MT",
-        /* "BudHand", "CAMPBELL", "Calibri", "Californian FB", "Calisto MT", "Calligraph421 BT",*/
+        /* "BudHand","CAMPBELL","Calibri","Californian FB","Calisto MT","Calligraph421 BT",*/
         "Cambria",
-        /* "Candara", "Capitals",*/
-        "Caslon", "Castellar", "Cataneo BT", "Centaur", "Century Gothic", "Century Schoolbook", "Century Schoolbook L",
-        /* "Champignon", "Charcoal", "Charter", "Charter BT", "Chicago", "Chick", "Chiller", "ClearlyU", "Colonna MT",*/
-        "Comic Sans", "Comic Sans MS", "Consolas", "Constantia", "Cooper Black", "Copperplate", "Copperplate Gothic Bold", "Copperplate Gothic Light", "Corbel", "Courier", "Courier New",
-        /* "Croobie", "Curlz MT", "Desdemona", "Didot", "DomBold BT", "Edwardian Script ITC", "Engravers MT", "Eras Bold ITC", "Eras Demi ITC", "Eras Light ITC", "Eras Medium ITC", "Eurostile", "FIRSTHOME", "Fat", "Felix Titling", "Fine Hand", "Fixed", "Footlight MT Light", "Forte", "Franklin Gothic Book", "Franklin Gothic Demi", "Franklin Gothic Demi Cond", "Franklin Gothic Heavy", "Franklin Gothic Medium", "Franklin Gothic Medium Cond", "Freestyle Script", "French Script MT", "Freshbot", "Frosty",*/
+        /* "Candara","Capitals",*/
+        "Caslon","Castellar","Cataneo BT","Centaur","Century Gothic","Century Schoolbook","Century Schoolbook L",
+        /* "Champignon","Charcoal","Charter","Charter BT","Chicago","Chick","Chiller","ClearlyU","Colonna MT",*/
+        "Comic Sans", "Comic Sans MS","Consolas","Constantia","Cooper Black","Copperplate","Copperplate Gothic Bold","Copperplate Gothic Light","Corbel","Courier","Courier New",
+        /* "Croobie","Curlz MT","Desdemona","Didot","DomBold BT","Edwardian Script ITC","Engravers MT","Eras Bold ITC","Eras Demi ITC","Eras Light ITC","Eras Medium ITC","Eurostile","FIRSTHOME","Fat","Felix Titling","Fine Hand","Fixed","Footlight MT Light","Forte","Franklin Gothic Book","Franklin Gothic Demi","Franklin Gothic Demi Cond","Franklin Gothic Heavy","Franklin Gothic Medium","Franklin Gothic Medium Cond","Freestyle Script","French Script MT","Freshbot","Frosty",*/
         "Futura",
-        /* "GENUINE", "Gadget", "Garamond",*/
-        "Geneva", "Georgia", "Georgia Ref", "Geeza Pro", "Gigi", "Gill Sans", "Gill Sans MT", "Gill Sans MT Condensed", "Gill Sans MT Ext Condensed Bold", "Gill Sans Ultra Bold", "Gill Sans Ultra Bold Condensed",
-        /* "GlooGun", "Gloucester MT Extra Condensed", "Goudy Old Style", "Goudy Stout", "Haettenschweiler", "Harlow Solid Italic", "Harrington",*/
-        "Helvetica", "Helvetica Narrow", "Helvetica Neue", "Herculanum", "High Tower Text", "Highlight LET", "Hoefler Text", "Impact", "Imprint MT Shadow",
-        /* "Informal Roman", "Jenkins v2.0", "John Handy LET", "Jokerman", "Jokerman LET", "Jokewood", "Juice ITC", "Kabel Ult BT", "Kartika", "Kino MT", "Kristen ITC", "Kunstler Script", "La Bamba LET", */
-        "Lucida", "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "Lucida Grande", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
-        /* "Luxi Mono", "Luxi Sans", "Luxi Serif", "MARKETPRO", "MS Reference Sans Serif", "MS Reference Serif", "Magneto", "Maiandra GD", */
+        /* "GENUINE","Gadget","Garamond",*/
+        "Geneva","Georgia","Georgia Ref", "Geeza Pro", "Gigi","Gill Sans","Gill Sans MT","Gill Sans MT Condensed","Gill Sans MT Ext Condensed Bold","Gill Sans Ultra Bold","Gill Sans Ultra Bold Condensed",
+        /* "GlooGun","Gloucester MT Extra Condensed","Goudy Old Style","Goudy Stout","Haettenschweiler","Harlow Solid Italic","Harrington",*/
+        "Helvetica","Helvetica Narrow","Helvetica Neue","Herculanum","High Tower Text","Highlight LET","Hoefler Text","Impact","Imprint MT Shadow",
+        /* "Informal Roman","Jenkins v2.0","John Handy LET","Jokerman","Jokerman LET","Jokewood","Juice ITC","Kabel Ult BT","Kartika","Kino MT","Kristen ITC","Kunstler Script","La Bamba LET", */
+        "Lucida","Lucida Bright","Lucida Calligraphy","Lucida Console","Lucida Fax","Lucida Grande","Lucida Handwriting","Lucida Sans","Lucida Sans Typewriter","Lucida Sans Unicode",
+        /* "Luxi Mono","Luxi Sans","Luxi Serif","MARKETPRO","MS Reference Sans Serif","MS Reference Serif","Magneto","Maiandra GD", */
         "Marker Felt",
-        /* "Matisse ITC", "Matura MT Script Capitals", "Mead Bold", "Mekanik LET", "Mercurius Script MT Bold", */
-        "Microsoft Sans Serif", "Milano LET", "Minion Web", "MisterEarl BT", "Mistral", "Monaco", "Monotype Corsiva", "Monotype.com", "New Century Schoolbook", "New York", "News Gothic MT",
-        /* "Niagara Engraved", "Niagara Solid", "Nimbus Mono L", "Nimbus Roman No9 L", "OCR A Extended", "OCRB", "Odessa LET", "Old English Text MT", "OldDreadfulNo7 BT", "One Stroke Script LET", "Onyx", "Optima", "Orange LET", "Palace Script MT", "Palatino", "Palatino Linotype", */
+        /* "Matisse ITC","Matura MT Script Capitals","Mead Bold","Mekanik LET","Mercurius Script MT Bold", */
+        "Microsoft Sans Serif","Milano LET","Minion Web","MisterEarl BT","Mistral","Monaco","Monotype Corsiva","Monotype.com","New Century Schoolbook","New York","News Gothic MT",
+        /* "Niagara Engraved","Niagara Solid","Nimbus Mono L","Nimbus Roman No9 L","OCR A Extended","OCRB","Odessa LET","Old English Text MT","OldDreadfulNo7 BT","One Stroke Script LET","Onyx","Optima","Orange LET","Palace Script MT","Palatino","Palatino Linotype", */
         "Papyrus",
-        /* "ParkAvenue BT", "Pepita MT", "Perpetua", "Perpetua Titling MT", "Placard Condensed", "Playbill", "Poornut", "Pristina", "Pump Demi Bold LET", "Pussycat", "Quixley LET", "Rage Italic", "Rage Italic LET", "Ravie", "Rockwell", "Rockwell Condensed", "Rockwell Extra Bold", "Ruach LET", "Runic MT Condensed", "Sand", "Script MT Bold", "Scruff LET", "Segoe UI", "Showcard Gothic", "Skia", "Smudger LET", "Snap ITC", "Square721 BT", "Staccato222 BT", "Stencil", "Sylfaen", */
-        "Tahoma", "Techno", "Tempus Sans ITC", "Terminal", "Textile", "Times", "Times New Roman", "Tiranti Solid LET", "Trebuchet MS",
-        /* "Tw Cen MT", "Tw Cen MT Condensed", "Tw Cen MT Condensed Extra Bold", "URW Antiqua T", "URW Bookman L", "URW Chancery L", "URW Gothic L", "URW Palladio L", "Univers", "University Roman LET", "Utopia", */
-        "Verdana", "Verdana Ref", /* "Victorian LET", "Viner Hand ITC", "Vivaldi", "Vladimir Script", "Vrinda", "Weltron Urban", "Westwood LET", "Wide Latin", "Zapf Chancery", */
+        /* "ParkAvenue BT","Pepita MT","Perpetua","Perpetua Titling MT","Placard Condensed","Playbill","Poornut","Pristina","Pump Demi Bold LET","Pussycat","Quixley LET","Rage Italic","Rage Italic LET","Ravie","Rockwell","Rockwell Condensed","Rockwell Extra Bold","Ruach LET","Runic MT Condensed","Sand","Script MT Bold","Scruff LET","Segoe UI","Showcard Gothic","Skia","Smudger LET","Snap ITC","Square721 BT","Staccato222 BT","Stencil","Sylfaen", */
+        "Tahoma","Techno","Tempus Sans ITC","Terminal","Textile","Times","Times New Roman","Tiranti Solid LET","Trebuchet MS",
+        /* "Tw Cen MT","Tw Cen MT Condensed","Tw Cen MT Condensed Extra Bold","URW Antiqua T","URW Bookman L","URW Chancery L","URW Gothic L","URW Palladio L","Univers","University Roman LET","Utopia", */
+        "Verdana","Verdana Ref", /* "Victorian LET","Viner Hand ITC","Vivaldi","Vladimir Script","Vrinda","Weltron Urban","Westwood LET","Wide Latin","Zapf Chancery", */
         "Zapfino"];
 
 // Compare against the reference fonts. Return true if it produces a different size than at least one of them.
@@ -267,7 +143,7 @@ var _CPFontDetectFontAvailable = function(font)
         if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
             return true;
     return false;
-};
+}
 
 var _CPFontDetectCache = {};
 
@@ -289,7 +165,7 @@ var _CPFontDetectCompareFonts = function(fontA, fontB)
         bHeight = _CPFontDetectSpan.offsetHeight;
 
     return (a.w != bWidth || a.h != bHeight);
-};
+}
 
 // Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
 var _CPFontDetectPickTwoDifferentFonts = function(candidates)
@@ -299,6 +175,6 @@ var _CPFontDetectPickTwoDifferentFonts = function(candidates)
             if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
                 return [candidates[i], candidates[j]];
     return [candidates[0]];
-};
+}
 
 [CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGeometry.j

@@ -1,6 +1,6 @@
 /*
  * CPGeometry.j
- * Foundation
+ * AppKit
  *
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
@@ -20,108 +20,34 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CGGeometry.j"
-       
+@import "CGGeometry.j"
+
+
 CPMinXEdge = 0;
 CPMinYEdge = 1;
 CPMaxXEdge = 2;
 CPMaxYEdge = 3;
 
-/*!
-    Makes a CGPoint object out of two numbers provided as arguments
-    @group CGPoint
-    @param x the x-coordinate of the CGPoint
-    @param y the y-coordinate of the CGPoint
-    @return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
-*/
+// FIXME: the rest!
 CPMakePoint = CGPointMake;
-
-/*!
-    Creates and returns a new CGSize object from the provided dimensions.
-    @group CGSize
-    @param width the width for the new CGSize
-    @param height the height for the new CGSize
-    @return CGSize the new CGSize
-*/
 CPMakeSize = CGSizeMake;
-
-/*!
-    Returns a CGRect made of the specified arguments
-    @group CGRect
-    @param x the x-coordinate of the rectangle's origin
-    @param y the y-coordinate of the rectangle's origin
-    @param width the width of the new rectangle
-    @param height the height of the new rectangle
-    @return CGRect the new rectangle
-*/
 CPMakeRect = CGRectMake;
 
 /*!
-    Creates a copy of a specified point and returns the copy
-    @group CGPoint
-    @param the point to be copied
-    @return CGPoint the copy of the provided CGPoint
+    @addtogroup appkit
+    @{
 */
-CPPointCreateCopy = CGPointMakeCopy;
 
 /*!
-    Tests whether the two CGPoints are equal to each other by comparing their
-    \c x and \c y members.
-    @group @CGPoint
-    @param lhsPoint the first CGPoint to check
-    @param rhsPoint the second CGPoint to check
-    @return BOOL \c YES if the two points have the same x's, and the same y's.
-*/
-CPPointEqualToPoint = CGPointEqualToPoint;
-
-/*!
-    Tests whether the CGPoint is contained by the CGRect.
-    @group CGPoint
-    @param aPoint the CGPoint to check
-    @param aRect the CGRect to check
-    @return BOOL \c YES if the rect contains the point.
-*/
-CPPointInRect = function(aPoint, aRect)
+  Creates a copy of a specified point and returns the copy
+  @group CGPoint
+  @param the point to be copied
+  @return CGPoint the copy of the provided CGPoint
+  */
+function CPPointCreateCopy(aPoint)
 {
-    return CGRectContainsPoint(aRect, aPoint)
-};
-
-/*!
-    Test whether the two CGRects have the same origin and size
-    @group CGRect
-    @param lhsRect the first CGRect to compare
-    @param rhsRect the second CGRect to compare
-    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
-*/
-CPRectEqualToRect = CGRectEqualToRect;
-
-/*!
-    Returns \c YES if the CGRect has no area.
-    The test is performed by checking if the width and height are both zero.
-    @group CGRect
-    @param aRect the CGRect to test
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
-*/
-CPRectIsEmpty = CGRectIsEmpty;
-
-/*!
-    Returns a \c BOOL indicating whether CGRect \c possibleOuter
-    contains CGRect \c possibleInner.
-    @group CGRect
-    @param possibleOuter the CGRect to test if \c possibleInner is inside of
-    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
-    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
-*/
-CPRectContainsRect = CGRectContainsRect;
-
-/*!
-    Returns the intersection of the two provided rectangles as a new rectangle
-    @group CGRect
-    @param lhsRect the first rectangle used for calculation
-    @param rhsRect the second rectangle used for calculation
-    @return CGRect the intersection of the two rectangles
-*/
-CPRectIntersection = CGRectIntersection;
+    return { x: aPoint.x, y: aPoint.y };
+}
 
 /*!
   Makes a CGPoint object out of two numbers provided as arguments
@@ -129,8 +55,11 @@ CPRectIntersection = CGRectIntersection;
   @param x the x-coordinate of the CGPoint
   @param y the y-coordinate of the CGPoint
   @return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
-*/
-CPPointMake = CGPointMake;
+  */
+function CPPointMake(x, y)
+{
+    return { x: x, y: y };
+}
 
 /*!
     Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
@@ -139,7 +68,11 @@ CPPointMake = CGPointMake;
     @group CGRect
     @return CGRect a rectangle like \c aRect with an inset
 */
-CPRectInset = CGRectInset;
+function CPRectInset(aRect, dX, dY)
+{
+    return CPRectMake(  aRect.origin.x + dX, aRect.origin.y + dY,
+                        aRect.size.width - 2 * dX, aRect.size.height - 2 * dY);
+}
 
 /*!
     @group CGRect
@@ -147,7 +80,31 @@ CPRectInset = CGRectInset;
     @return void
     @deprecated
 */
-CPRectIntegral = CGRectIntegral;
+function CPRectIntegral(aRect)
+{
+    // FIXME!!!
+    alert("CPRectIntegral unimplemented");
+}
+
+/*!
+    Returns the intersection of the two provided rectangles as a new rectangle
+    @group CGRect
+    @param lhsRect the first rectangle used for calculation
+    @param rhsRect the second rectangle used for calculation
+    @return CGRect the intersection of the two rectangles
+*/
+function CPRectIntersection(lhsRect, rhsRect)
+{
+    var intersection = CPRectMake(
+        Math.max(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
+        Math.max(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        0, 0);
+
+    intersection.size.width = Math.min(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)) - CPRectGetMinX(intersection);
+    intersection.size.height = Math.min(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect)) - CPRectGetMinY(intersection);
+
+    return CPRectIsEmpty(intersection) ? CPRectMakeZero() : intersection;
+}
 
 /*!
     Creates a copy of the provided rectangle
@@ -155,7 +112,10 @@ CPRectIntegral = CGRectIntegral;
     @param aRect the CGRect that will be copied
     @return CGRect the rectangle copy
 */
-CPRectCreateCopy = CGRectCreateCopy;
+function CPRectCreateCopy(aRect)
+{
+    return { origin: CPPointCreateCopy(aRect.origin), size: CPSizeCreateCopy(aRect.size) };
+}
 
 /*!
     Returns a CGRect made of the specified arguments
@@ -166,7 +126,10 @@ CPRectCreateCopy = CGRectCreateCopy;
     @param height the height of the new rectangle
     @return CGRect the new rectangle
 */
-CPRectMake = CGRectMake;
+function CPRectMake(x, y, width, height)
+{
+    return { origin: CPPointMake(x, y), size: CPSizeMake(width, height) };
+}
 
 /*!
     Creates a new rectangle with its origin offset by \c dX and \c dY.
@@ -176,14 +139,36 @@ CPRectMake = CGRectMake;
     @param dY the amount added to the y-size of the new rectangle
     @return CGRect the new rectangle with modified size
 */
-CPRectOffset = CGRectOffset;
+function CPRectOffset(aRect, dX, dY)
+{
+    return CPRectMake(aRect.origin.x + dX, aRect.origin.y + dY, aRect.size.width, aRect.size.height);
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return CGRect
 */
-CPRectStandardize = CGRectStandardize;
+function CPRectStandardize(aRect)
+{
+    var width = CPRectGetWidth(aRect),
+        height = CPRectGetHeight(aRect),
+        standardized = CPRectCreateCopy(aRect);
+
+    if (width < 0.0)
+    {
+        standardized.origin.x += width;
+        standardized.size.width = -width;
+    }
+
+    if (height < 0.0)
+    {
+        standardized.origin.y += height;
+        standardized.size.height = -height;
+    }
+
+    return standardized;
+}
 
 /*!
     Returns the smallest rectangle that can contain the two argument \c CGRects.
@@ -192,7 +177,15 @@ CPRectStandardize = CGRectStandardize;
     @param rhsRect the second CGRect to use for the union calculation
     @return CGRect the union rectangle
 */
-CPRectUnion = CGRectUnion;
+function CPRectUnion(lhsRect, rhsRect)
+{
+    var minX = Math.min(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
+        minY = Math.min(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        maxX = Math.max(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
+        maxY = Math.max(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
+
+    return CPRectMake(minX, minY, maxX - minX, maxY - minY);
+}
 
 /*!
     Creates and returns a copy of the provided CGSize
@@ -200,7 +193,10 @@ CPRectUnion = CGRectUnion;
     @param aSize the CGSize to copy
     @return CGSize the copy of the CGSize
 */
-CPSizeCreateCopy = CGSizeCreateCopy;
+function CPSizeCreateCopy(aSize)
+{
+    return { width: aSize.width, height: aSize.height };
+}
 
 /*!
     Creates and returns a new CGSize object from the provided dimensions.
@@ -209,7 +205,10 @@ CPSizeCreateCopy = CGSizeCreateCopy;
     @param height the height for the new CGSize
     @return CGSize the new CGSize
 */
-CPSizeMake = CGSizeMake;
+function CPSizeMake(width, height)
+{
+    return { width: width, height: height };
+}
 
 /*!
     Returns \c YES if the CGRect, \c aRect, contains
@@ -219,63 +218,132 @@ CPSizeMake = CGSizeMake;
     @group CGRect
     @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
 */
-CPRectContainsPoint = CGRectContainsPoint;
+function CPRectContainsPoint(aRect, aPoint)
+{
+    return  aPoint.x >= CPRectGetMinX(aRect) &&
+            aPoint.y >= CPRectGetMinY(aRect) &&
+            aPoint.x < CPRectGetMaxX(aRect) &&
+            aPoint.y < CPRectGetMaxY(aRect);
+}
+
+/*!
+    Returns a \c BOOL indicating whether CGRect \c possibleOuter
+    contains CGRect \c possibleInner.
+    @group CGRect
+    @param possibleOuter the CGRect to test if \c possibleInner is inside of
+    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
+    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
+*/
+function CPRectContainsRect(possibleOuter, possibleInner)
+{
+    return CGRectContainsRect(possibleOuter, possibleInner);
+}
+
+/*!
+    Tests whether the two CGPoints are equal to each other by comparing their
+    \c x and \c y members.
+    @group @CGPoint
+    @param lhsPoint the first CGPoint to check
+    @param rhsPoint the second CGPoint to check
+    @return BOOL \c YES if the two points have the same x's, and the same y's.
+*/
+function CPPointEqualToPoint(lhsPoint, rhsPoint)
+{
+    return lhsPoint.x == rhsPoint.x && lhsPoint.y == rhsPoint.y;
+}
+
+/*!
+    Test whether the two CGRects have the same origin and size
+    @group CGRect
+    @param lhsRect the first CGRect to compare
+    @param rhsRect the second CGRect to compare
+    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
+*/
+function CPRectEqualToRect(lhsRect, rhsRect)
+{
+    return  CPPointEqualToPoint(lhsRect.origin, rhsRect.origin) &&
+            CPSizeEqualToSize(lhsRect.size, rhsRect.size);
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetHeight = CGRectGetHeight;
+function CPRectGetHeight(aRect)
+{
+    return aRect.size.height;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMaxX = CGRectGetMaxX;
+function CPRectGetMaxX(aRect)
+{
+    return aRect.origin.x + aRect.size.width;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMaxY = CGRectGetMaxY;
+function CPRectGetMaxY(aRect)
+{
+    return aRect.origin.y + aRect.size.height;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return float
 */
-CPRectGetMidX = CGRectGetMidX;
+function CPRectGetMidX(aRect)
+{
+    return aRect.origin.x + (aRect.size.width) / 2.0;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return float
 */
-CPRectGetMidY = CGRectGetMidY;
+function CPRectGetMidY(aRect)
+{
+    return aRect.origin.y + (aRect.size.height) / 2.0;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMinX = CGRectGetMinX;
+function CPRectGetMinX(aRect)
+{
+    return aRect.origin.x;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMinY = CGRectGetMinY;
+function CPRectGetMinY(aRect)
+{
+    return aRect.origin.y;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetWidth = CGRectGetWidth;
+function CPRectGetWidth(aRect)
+{
+    return aRect.size.width;
+}
 
 /*!
     Returns \c YES if the two rectangles intersect
@@ -284,7 +352,22 @@ CPRectGetWidth = CGRectGetWidth;
     @param rhsRect the second CGRect
     @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
 */
-CPRectIntersectsRect = CGRectIntersectsRect;
+function CPRectIntersectsRect(lhsRect, rhsRect)
+{
+    return !CPRectIsEmpty(CPRectIntersection(lhsRect, rhsRect));
+}
+
+/*!
+    Returns \c YES if the CGRect has no area.
+    The test is performed by checking if the width and height are both zero.
+    @group CGRect
+    @param aRect the CGRect to test
+    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+*/
+function CPRectIsEmpty(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
 
 /*!
     Returns \c YES if the CGRect has no area.
@@ -292,7 +375,10 @@ CPRectIntersectsRect = CGRectIntersectsRect;
     @group CGRect
     @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
 */
-CPRectIsNull = CGRectIsNull;
+function CPRectIsNull(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
 
 /*!
     Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
@@ -303,7 +389,10 @@ CPRectIsNull = CGRectIsNull;
 
     @group CGRect
 */
-CPDivideRect = CGRectDivide;
+function CPDivideRect(inRect, slice, rem, amount, edge)
+{
+    CGRectDivide(inRect, slice, rem, amount, edge);
+}
 
 /*!
     Returns \c YES if the two CGSizes are identical.
@@ -312,7 +401,10 @@ CPDivideRect = CGRectDivide;
     @param rhsSize the second CGSize to compare
     @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
 */
-CPSizeEqualToSize = CGSizeEqualToSize;
+function CPSizeEqualToSize(lhsSize, rhsSize)
+{
+    return lhsSize.width == rhsSize.width && lhsSize.height == rhsSize.height;
+}
 
 /*!
     Returns a human readable string of the provided CGPoint.
@@ -320,7 +412,10 @@ CPSizeEqualToSize = CGSizeEqualToSize;
     @param aPoint the point to represent
     @return CGPoint a string representation of the CGPoint
 */
-CPStringFromPoint = CGStringFromPoint;
+function CPStringFromPoint(aPoint)
+{
+    return "{" + aPoint.x + ", " + aPoint.y + "}";
+}
 
 /*!
     Returns a human readable string of the provided CGSize.
@@ -328,7 +423,10 @@ CPStringFromPoint = CGStringFromPoint;
     @param aSize the size to represent
     @return CGSize a string representation of the CGSize
 */
-CPStringFromSize = CGStringFromSize;
+function CPStringFromSize(aSize)
+{
+    return "{" + aSize.width + ", " + aSize.height + "}";
+}
 
 /*!
     Returns a human readable string of the provided CGRect.
@@ -336,7 +434,10 @@ CPStringFromSize = CGStringFromSize;
     @param aRect the rectangle to represent
     @return CGString the string representation of the rectangle
 */
-CPStringFromRect = CGStringFromRect;
+function CPStringFromRect(aRect)
+{
+    return "{" + CPStringFromPoint(aRect.origin) + ", " + CPStringFromSize(aRect.size) + "}";
+}
 
 /*!
     Returns a CGPoint from a string with a comma separated pair of integers.
@@ -344,7 +445,12 @@ CPStringFromRect = CGStringFromRect;
     @param aString a string containing two comma separated integers
     @return CGPoint the point object created from the string
 */
-CPPointFromString = CGPointFromString;
+function CPPointFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { x:parseFloat(aString.substr(1, comma - 1), 10), y:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
 
 /*!
     Returns a CGSize from a string containing a pair of comma separated integers.
@@ -352,7 +458,12 @@ CPPointFromString = CGPointFromString;
     @param aString a string containing two comma separated integers
     @return CGSize the size object created from the string
 */
-CPSizeFromString = CGSizeFromString;
+function CPSizeFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { width:parseFloat(aString.substr(1, comma - 1), 10), height:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
 
 /*!
     Returns a CGRect created from a string.
@@ -360,32 +471,53 @@ CPSizeFromString = CGSizeFromString;
     @param aString a string in the form generated by \c CPStringFromRect
     @return CGRect the rectangle created from the string
 */
-CPRectFromString = CGRectFromString;
+function CPRectFromString(aString)
+{
+    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
+
+    return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
+}
 
 /*!
     @group CGPoint
     @param anEvent
     @return CGPoint
 */
-CPPointFromEvent = CGPointFromEvent;
+function CPPointFromEvent(anEvent)
+{
+    return CPPointMake(anEvent.clientX, anEvent.clientY, 0);
+}
 
 /*!
     Returns a zero sized CGSize.
     @group CGSize
     @return CGSize a size object with zeros for \c width and \c height
 */
-CPSizeMakeZero = CGSizeMakeZero;
+function CPSizeMakeZero()
+{
+    return CPSizeMake(0, 0);
+}
 
 /*!
     Returns a rectangle at origin \c (0,0) and size of \c (0,0).
     @group CGRect
     @return CGRect a zeroed out CGRect
 */
-CPRectMakeZero = CGRectMakeZero;
+function CPRectMakeZero()
+{
+    return CPRectMake(0, 0, 0, 0);
+}
 
 /*!
     Returns a point located at \c (0, 0).
     @group CGPoint
     @return CGPoint a point located at \c (0, 0)
 */
-CPPointMakeZero = CGPointMakeZero;
+function CPPointMakeZero()
+{
+    return CPPointMake(0, 0, 0);
+}
+
+/*!
+    @}
+*/

AppKit/CPGradient.j

@@ -1,123 +0,0 @@
-/*
- * CPGradient.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
-CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
-
-/*!
-    A class for drawing linear and radial gradients with a convenient API.
-*/
-@implementation CPGradient : CPObject
-{
-    CGGradient _gradient;
-}
-
-- (id)initWithColors:(CPArray)someColors
-{
-    var count = [someColors count];
-
-    if (count < 2)
-        [CPException raise:CPInvalidArgumentException reason:@"at least 2 colors required"];
-
-    var distance = 1.0 / (count - 1),
-        locations = [CPMutableArray array],
-        location = 0.0;
-
-    for (var i = 0; i < count; i++)
-    {
-        [locations addObject:location];
-        location += distance;
-    }
-
-    return [self initWithColors:someColors atLocations:locations colorSpace:nil];
-}
-
-- (id)initWithColors:(CPArray)someColors atLocations:(CPArray)someLocations colorSpace:(CPColorSpace)aColorSpace
-{
-    if (self = [super init])
-    {
-        var cgColors = [],
-            count = [someColors count],
-            colorSpace = [aColorSpace CGColorSpace] || CGColorSpaceCreateDeviceRGB;
-        for (var i = 0; i < count; i++)
-            cgColors.push(CGColorCreate(colorSpace, [someColors[i] components]));
-        _gradient = CGGradientCreateWithColors(colorSpace, cgColors, someLocations);
-    }
-
-    return self;
-}
-
-- (void)drawInRect:(CGRect)rect angle:(float)angle
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSaveGState(ctx);
-    CGContextClipToRect(ctx, rect);
-    CGContextAddRect(ctx, rect);
-
-    var startPoint,
-        endPoint;
-
-    // Modulo of negative values doesn't work as expected in JS.
-    angle = ((angle % 360.0) + 360.0) % 360.0;
-
-    if (angle < 90.0)
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMinY(rect));
-    else if (angle < 180.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMinY(rect));
-    else if (angle < 270.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMaxY(rect));
-    else
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMaxY(rect));
-
-    // A line segment comes out of the starting point at the given angle, with the first colour
-    // at the starting point and the last at the end. To do what drawInRect: is supposed to do
-    // we want the opposite corner of the starting corner to just reach the final colour stop.
-    // So when the angle isn't a right angle, the segment has to extend beyond the edge of the
-    // rectangle just far enough. This is hard to describe without a picture but if we place
-    // another line through the opposite corner at -90 degrees, it'll help form some triangles
-    // from which we can derive this formula:
-    //
-    // length = cos(angle) * (rectWidth + rectHeight * tan(angle))
-    //
-    // This simplifies down to (in the first quadrant) rectWidth * cos(a) + rectHeight * sin(a).
-
-    var radians = PI * angle / 180.0,
-        length = ABS(_CGRectGetWidth(rect) * COS(radians)) + ABS(_CGRectGetHeight(rect) * SIN(radians));
-
-    endPoint = _CGPointMake(startPoint.x + length * COS(radians),
-                           startPoint.y + length * SIN(radians));
-
-    [self drawFromPoint:startPoint toPoint:endPoint options:CPGradientDrawsBeforeStartingLocation | CPGradientDrawsAfterEndingLocation];
-    CGContextRestoreGState(ctx);
-}
-
-- (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    // TODO kCGGradientDrawsBeforeStartLocation and kCGGradientDrawsAfterEndLocation are not actually supported
-    // by CGContextDrawLinearGradient yet.
-    CGContextDrawLinearGradient(ctx, _gradient, startingPoint, endingPoint, options);
-}
-
-@end

AppKit/CPGraphics.j

@@ -23,16 +23,6 @@
 @import "CPColor.j"
 @import "CPGraphicsContext.j"
 
-CPCalibratedWhiteColorSpace = @"CalibratedWhiteColorSpace";
-CPCalibratedBlackColorSpace = @"CalibratedBlackColorSpace";
-CPCalibratedRGBColorSpace   = @"CalibratedRGBColorSpace";
-CPDeviceWhiteColorSpace     = @"DeviceWhiteColorSpace";
-CPDeviceBlackColorSpace     = @"DeviceBlackColorSpace";
-CPDeviceRGBColorSpace       = @"DeviceRGBColorSpace";
-CPDeviceCMYKColorSpace      = @"DeviceCMYKColorSpace";
-CPNamedColorSpace           = @"NamedColorSpace";
-CPPatternColorSpace         = @"PatternColorSpace";
-CPCustomColorSpace          = @"CustomColorSpace";
 
 function CPDrawTiledRects(
    /* CGRect */ boundsRect,
@@ -80,10 +70,7 @@ function CPDrawColorTiledRects(
         if (_CGRectIsEmpty(slice))
             continue;
 
-        var minX,
-            maxX,
-            minY,
-            maxY;
+        var minX, maxX, minY, maxY;
 
         if (side == CPMinXEdge || side == CPMaxXEdge)
         {
@@ -118,4 +105,4 @@ function CPDrawColorTiledRects(
     CGContextRestoreGState(context);
 
     return resultRect;
-}
+}

AppKit/CPGraphicsContext.j

@@ -25,8 +25,7 @@
 @import "CGContext.j"
 
 
-var CPGraphicsContextCurrent = nil,
-    CPGraphicsContextThreadStack = nil;
+var CPGraphicsContextCurrent = nil;
 
 /*!
     @ingroup appkit
@@ -53,28 +52,6 @@ var CPGraphicsContextCurrent = nil,
     CPGraphicsContextCurrent = aGraphicsContext;
 }
 
-+ (void)saveGraphicsState
-{
-    if (!CPGraphicsContextCurrent)
-        return;
-
-    if (!CPGraphicsContextThreadStack)
-        CPGraphicsContextThreadStack = [CPMutableArray array];
-
-    [CPGraphicsContextThreadStack addObject:CPGraphicsContextCurrent];
-    [CPGraphicsContextCurrent saveGraphicsState];
-}
-
-+ (void)restoreGraphicsState
-{
-    var lastContext = [CPGraphicsContextThreadStack lastObject];
-    if (lastContext)
-    {
-        [lastContext restoreGraphicsState];
-        [CPGraphicsContextThreadStack removeLastObject];
-    }
-}
-
 /*!
     Creates a graphics context with a provided port.
     @param aContext the context to initialize with
@@ -109,27 +86,4 @@ var CPGraphicsContextCurrent = nil,
     return _graphicsPort;
 }
 
-/*!
-    (Not implemented. Always returns Cappuccino's default, `YES`.)
-
-    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
-    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
-
-    Note: Cappuccino is flipped by default.
-*/
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
-- (void)saveGraphicsState
-{
-    CGContextSaveGState(_graphicsPort);
-}
-
-- (void)restoreGraphicsState
-{
-    CGContextRestoreGState(_graphicsPort);
-}
-
 @end

AppKit/CPImage.j

@@ -21,12 +21,13 @@
  */
 
 @import <Foundation/CPBundle.j>
-@import <Foundation/CPGeometry.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
 
+@import "CPGeometry.j"
+
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -43,8 +44,7 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { },
-    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
+    AppKitImageForNames = { };
 
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
@@ -157,20 +157,6 @@ function CPAppKitImage(aFilename, aSize)
     return self;
 }
 
-/*!
-    Initializes the receiver with the specified data. The method loads the data into memory.
-    @param someData the CPData object representing the image
-    @return the initialized image
-*/
-- (id)initWithData:(CPData)someData
-{
-    var base64 = [someData base64],
-        type = [base64 hasPrefix:@"/9j/4AAQSkZJRgABAQEASABIAAD/"] ? @"jpg" : @"png",
-        dataURL = "data:image/" + type + ";base64," + base64;
-
-    return [self initWithContentsOfFile:dataURL];
-}
-
 /*!
     Returns the path of the file associated with this image.
 */
@@ -179,37 +165,6 @@ function CPAppKitImage(aFilename, aSize)
     return _filename;
 }
 
-/*!
-    Returns the data associated with this image.
-    @discussion Returns nil if the reciever was not initialized with -initWithData: and the browser does not support the canvas feature;
-*/
-- (CPData)data
-{
-#if PLATFORM(DOM)
-    var dataURL;
-
-    if ([_filename hasPrefix:@"data:image"])
-        dataURL = _filename;
-    else if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
-    {
-        var canvas = document.createElement("canvas"),
-            ctx = canvas.getContext("2d");
-
-        canvas.width = _image.width,
-        canvas.height = _image.height;
-
-        ctx.drawImage(_image, 0, 0);
-
-        dataURL = canvas.toDataURL("image/png");
-    }
-    else
-        return nil;
-
-    var base64 = dataURL.replace(/^data:image\/png;base64,/, "");
-    return [CPData dataWithBase64:base64];
-#endif
-}
-
 /*!
     Sets the size of the image.
     @param the size of the image
@@ -325,7 +280,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onerror = function ()
         {
@@ -337,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onabort = function ()
         {
@@ -349,7 +304,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.src = _filename;
 
@@ -369,24 +324,6 @@ function CPAppKitImage(aFilename, aSize)
     return NO;
 }
 
-- (CPString)description
-{
-    var filename = [self filename],
-        size = [self size];
-
-    if (filename.indexOf("data:") === 0)
-    {
-        var index = filename.indexOf(",");
-
-        if (index > 0)
-            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
-        else
-            filename = "data:<unknown type>";
-    }
-
-    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
-}
-
 /* @ignore */
 - (void)_derefFromImage
 {

AppKit/CPImageView.j

@@ -26,6 +26,11 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -36,7 +41,15 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;
 
-var CPImageViewEmptyPlaceholderImage = nil;
+var CPImageViewShadowBackgroundColor = nil,
+    CPImageViewEmptyPlaceholderImage = nil;
+
+var LEFT_SHADOW_INSET       = 3.0,
+    RIGHT_SHADOW_INSET      = 3.0,
+    TOP_SHADOW_INSET        = 3.0,
+    BOTTOM_SHADOW_INSET     = 5.0,
+    VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
+    HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
 
 /*!
     @ingroup appkit
@@ -59,22 +72,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 + (void)initialize
 {
-    if (self !== [CPImageView class])
-        return;
-
     var bundle = [CPBundle bundleForClass:[CPView class]];
 
     CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
-        return [CPImageViewValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -238,7 +240,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     [super setImageScaling:anImageScaling];
 
 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
@@ -295,19 +297,19 @@ var CPImageViewEmptyPlaceholderImage = nil;
         imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
         x = 0.0,
         y = 0.0,
-        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
-        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
+        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
+        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
         boundsWidth = _CGRectGetWidth(bounds),
         boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
         height = boundsHeight - insetHeight;
 
-    if (imageScaling === CPImageScaleAxesIndependently)
+    if (imageScaling === CPScaleToFit)
     {
-        #if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(width);
-            _DOMImageElement.height = ROUND(height);
-        #endif
+#if PLATFORM(DOM)
+        _DOMImageElement.width = ROUND(width);
+        _DOMImageElement.height = ROUND(height);
+#endif
     }
     else
     {
@@ -316,19 +318,17 @@ var CPImageViewEmptyPlaceholderImage = nil;
         if (size.width == -1 && size.height == -1)
             return;
 
-        switch (imageScaling)
+        if (imageScaling === CPScaleProportionally)
         {
-            case CPImageScaleProportionallyDown:
-                if (width >= size.width && height >= size.height)
-                {
-                    width = size.width;
-                    height = size.height;
-                    break;
-                }
-
-                // intentionally fall through to the next case
-
-            case CPImageScaleProportionallyUpOrDown:
+            // The max size it can be is size.width x size.height, so only
+            // only proportion otherwise.
+            if (width >= size.width && height >= size.height)
+            {
+                width = size.width;
+                height = size.height;
+            }
+            else
+            {
                 var imageRatio = size.width / size.height,
                     viewRatio = width / height;
 
@@ -336,19 +336,26 @@ var CPImageViewEmptyPlaceholderImage = nil;
                     width = height * imageRatio;
                 else
                     height = width / imageRatio;
-                break;
+            }
 
-            case CPImageScaleAxesIndependently:
-            case CPImageScaleNone:
-                width = size.width;
-                height = size.height;
-                break;
-        }
-
-        #if PLATFORM(DOM)
+#if PLATFORM(DOM)
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-        #endif
+#endif
+        }
+        else
+        {
+            width = size.width;
+            height = size.height;
+        }
+
+        if (imageScaling == CPScaleNone)
+        {
+#if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(size.width);
+            _DOMImageElement.height = ROUND(size.height);
+#endif
+        }
 
         var x,
             y;
@@ -399,7 +406,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     _imageRect = _CGRectMake(x, y, width, height);
 
     if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -450,39 +457,6 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 @end
 
-@implementation CPImageViewValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [self _setPlaceholder:nil forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setImage:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    var image;
-
-    if (aBinding === CPDataBinding)
-        image = [[CPImage alloc] initWithData:aValue];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [[CPImage alloc] initWithContentsOfFile:aValue];
-    else if (aBinding === CPValueBinding)
-        image = aValue;
-
-    [_source setImage:image];
-}
-
-@end
-
 var CPImageViewImageKey          = @"CPImageViewImageKey",
     CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
     CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
@@ -509,9 +483,6 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
         _DOMImageElement.setAttribute("draggable", "true");
         _DOMImageElement.style["-khtml-user-drag"] = "element";
     }
-
-    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
-        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
 #endif
 
     self = [super initWithCoder:aCoder];
@@ -525,7 +496,7 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
         [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
 
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
             [self setEditable:YES];
 
         [self setNeedsLayout];

AppKit/CPKeyBinding.j

@@ -28,7 +28,6 @@
 CPStandardKeyBindings = {
     @"@.": @"cancelOperation:",
 
-    @"@a": @"selectAll:",
     @"^a": @"moveToBeginningOfParagraph:",
     @"^$a": @"moveToBeginningOfParagraphAndModifySelection:",
     @"^b": @"moveBackward:",
@@ -153,7 +152,7 @@ var CPKeyBindingCache = {};
 
 + (void)initialize
 {
-    if (self !== [CPKeyBinding class])
+    if ([self class] !== CPKeyBinding)
         return;
 
     [self createKeyBindingsFromJSObject:CPStandardKeyBindings];

AppKit/CPKeyValueBinding.j

@@ -41,7 +41,6 @@ var CPBindingOperationAnd = 0,
     id              _source;
 
     JSObject        _suppressedNotifications;
-    JSObject        _placeholderForMarker;
 }
 
 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
@@ -126,13 +125,10 @@ var CPBindingOperationAnd = 0,
         _source = aSource;
         _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
         _suppressedNotifications = {};
-        _placeholderForMarker = {};
 
         if (options)
             [_info setObject:options forKey:CPOptionsKey];
 
-        [self _updatePlaceholdersWithOptions:options forBinding:aName];
-
         [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
 
         var bindings = [bindingsMap objectForKey:[_source UID]];
@@ -149,40 +145,15 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
-- (void)setValueFor:(CPString)theBinding
+- (void)setValueFor:(CPString)aBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
+        newValue = [destination valueForKeyPath:keyPath];
 
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
-        }
-
-        var value = [self _placeholderForMarker:newValue];
-        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
-    }
-    else
-    {
-        var value = [self transformValue:newValue withOptions:options];
-        [self setValue:value forBinding:theBinding];
-    }
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
+    newValue = [self transformValue:newValue withOptions:options];
+    [_source setValue:newValue forKey:aBinding];
 }
 
 - (void)reverseSetValueFor:(CPString)aBinding
@@ -190,18 +161,10 @@ var CPBindingOperationAnd = 0,
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        newValue = [self valueForBinding:aBinding];
+        newValue = [_source valueForKeyPath:aBinding];
 
     newValue = [self reverseTransformValue:newValue withOptions:options];
-
-    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
     [destination setValue:newValue forKeyPath:keyPath];
-    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source valueForKeyPath:aBinding];
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -241,13 +204,14 @@ var CPBindingOperationAnd = 0,
     if (valueTransformer)
         aValue = [valueTransformer transformedValue:aValue];
 
+
     if (aValue === undefined || aValue === nil || aValue === [CPNull null])
         aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;
 
     return aValue;
 }
 
-- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
 {
     var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
         valueTransformer;
@@ -307,47 +271,6 @@ var CPBindingOperationAnd = 0,
     delete objectSuppressions[aKeyPath];
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var count = [CPBinderPlaceholderMarkers count];
-
-    while (count--)
-    {
-        var marker = CPBinderPlaceholderMarkers[count],
-            optionName = CPBinderPlaceholderOptions[count],
-            isExplicit = [options containsKey:optionName],
-            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
-    }
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    [self _updatePlaceholdersWithOptions:options];
-}
-
-- (void)_placeholderForMarker:aMarker
-{
-    var placeholder = _placeholderForMarker[aMarker];
-    if (placeholder)
-        return placeholder['value'];
-    return nil;
-}
-
-- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
-{
-    if (isDefault)
-    {
-        var existingPlaceholder = _placeholderForMarker[aMarker];
-
-        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder['isDefault'])
-            return;
-    }
-
-    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
-}
-
 @end
 
 @implementation CPObject (KeyValueBindingCreation)
@@ -388,10 +311,10 @@ var CPBindingOperationAnd = 0,
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
     if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
+        return CPLog.error("Invalid object or path on "+self+" for "+aBinding);
 
     //if (![[self exposedBindings] containsObject:aBinding])
-    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
+    //    CPLog.warn("No binding exposed on "+self+" for "+aBinding);
 
     var binderClass = [[self class] _binderClassForBinding:aBinding];
 
@@ -481,7 +404,7 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
+var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
 {
     var bindingName = key,
         theBinding,
@@ -503,9 +426,9 @@ var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings,
     }
 
     return !operation;
-};
+}
 
-var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
+var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
     var theBinding = [bindings objectForKey:targetKey],
         infoDictionary = theBinding._info,
@@ -540,7 +463,7 @@ var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CP
     }
 
     [invocation invoke];
-};
+}
 
 // Keys in options dictionary
 
@@ -556,37 +479,15 @@ CPNotApplicableMarker   = @"CPNotApplicableMarker";
 CPNullMarker            = @"CPNullMarker";
 
 // Binding name constants
-CPAlignmentBinding                        = @"alignment";
-CPContentArrayBinding                     = @"contentArray";
-CPContentBinding                          = @"content";
-CPContentObjectBinding                    = @"contentObject";
-CPContentObjectsBinding                   = @"contentObjects";
-CPContentValuesBinding                    = @"contentValues";
-CPEditableBinding                         = @"editable";
-CPEnabledBinding                          = @"enabled";
-CPFontBinding                             = @"font";
-CPFontNameBinding                         = @"fontName";
-CPFontBoldBinding                         = @"fontBold";
-CPHiddenBinding                           = @"hidden";
-CPFilterPredicateBinding                  = @"filterPredicate";
-CPMaxValueBinding                         = @"maxValue";
-CPMinValueBinding                         = @"minValue";
-CPPredicateBinding                        = @"predicate";
-CPSelectedIndexBinding                    = @"selectedIndex";
-CPSelectedLabelBinding                    = @"selectedLabel";
-CPSelectedObjectBinding                   = @"selectedObject";
-CPSelectedObjectsBinding                  = @"selectedObjects";
-CPSelectedTagBinding                      = @"selectedTag";
-CPSelectedValueBinding                    = @"selectedValue";
-CPSelectedValuesBinding                   = @"selectedValues";
-CPSelectionIndexesBinding                 = @"selectionIndexes";
-CPTextColorBinding                        = @"textColor";
-CPTitleBinding                            = @"title";
-CPToolTipBinding                          = @"toolTip";
-CPValueBinding                            = @"value";
-CPValueURLBinding                         = @"valueURL";
-CPValuePathBinding                        = @"valuePath";
-CPDataBinding                             = @"data";
+CPAlignmentBinding      = @"alignment";
+CPEditableBinding       = @"editable";
+CPEnabledBinding        = @"enabled";
+CPFontBinding           = @"font";
+CPHiddenBinding         = @"hidden";
+CPSelectedIndexBinding  = @"selectedIndex";
+CPTextColorBinding      = @"textColor";
+CPToolTipBinding        = @"toolTip";
+CPValueBinding          = @"value";
 
 //Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
@@ -617,8 +518,4 @@ CPValueTransformerBindingOption                     = @"CPValueTransformer";
 CPIsControllerMarker = function(/*id*/anObject)
 {
     return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
-};
-
-var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
-    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
-
+}

AppKit/CPLevelIndicator.j

@@ -64,9 +64,6 @@ var _CPLevelIndicatorBezelColor = nil,
 
 + (void)initialize
 {
-    if (self !== [CPLevelIndicator class])
-        return;
-
     var bundle = [CPBundle bundleForClass:CPLevelIndicator];
 
     _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
@@ -152,9 +149,9 @@ var _CPLevelIndicatorBezelColor = nil,
     var filledColor = _CPLevelIndicatorSegmentNormalColor,
         value = [self doubleValue];
 
-    if (value <= _criticalValue)
+    if (value < _criticalValue)
         filledColor = _CPLevelIndicatorSegmentCriticalColor;
-    else if (value <= _warningValue)
+    else if (value < _warningValue)
         filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)
@@ -256,7 +253,7 @@ var _CPLevelIndicatorBezelColor = nil,
 
         var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
             bounds = [self bounds],
-            oldValue = [self doubleValue],
+            oldValue = [self doubleValue];
             newValue = oldValue;
 
         // Moving the mouse outside of the widget to the left sets it

AppKit/CPMenu/CPMenu.j

@@ -80,7 +80,7 @@ var _CPMenuBarVisible               = NO,
 
 + (void)initialize
 {
-    if (self !== [CPMenu class])
+    if (self !== CPMenu)
         return;
 
     [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
@@ -352,12 +352,8 @@ var _CPMenuBarVisible               = NO,
     while (count--)
         [_items[count] setMenu:nil];
 
-    _highlightedIndex = CPNotFound;
-
-    // Because we are changing _items directly, be sure to notify KVO
-    [self willChangeValueForKey:@"items"];
     _items = [CPMutableArray array];
-    [self didChangeValueForKey:@"items"];
+    _highlightedIndex = CPNotFound;
 }
 
 /*!
@@ -626,11 +622,11 @@ var _CPMenuBarVisible               = NO,
         var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
 
         if (!validator || ![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
+            [item _setEnabled:NO];
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
+            [item _setEnabled:[validator validateMenuItem:item]];
         else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
+            [item _setEnabled:[validator validateUserInterfaceItem:item]];
     }
 
     [[_menuWindow _menuView] tile];
@@ -715,7 +711,10 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    [self _menuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -803,10 +802,13 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    [aMenu _menuWillOpen];
+    var delegate = [aMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     if (!aFont)
-        aFont = [CPFont systemFontOfSize:[CPFont systemFontSize]];
+        aFont = [CPFont systemFontOfSize:12.0];
 
     var theWindow = [aView window],
         menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -873,15 +875,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    if (_highlightedIndex < 0)
-        return nil;
-
-    var highlightedItem = _items[_highlightedIndex];
-
-    if ([highlightedItem isSeparatorItem])
-        return nil;
-
-    return highlightedItem;
+    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
 }
 
 // Managing the Delegate
@@ -896,22 +890,6 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
-- (void)_menuWillOpen
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
-}
-
-- (void)_menuDidClose
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
-}
-
 // Handling Tracking
 /*!
     Cancels tracking.
@@ -976,7 +954,8 @@ var _CPMenuBarVisible               = NO,
 
     for (; index < count; ++index)
     {
-        var item = _items[index];
+        var item = _items[index],
+            modifierMask = [item keyEquivalentModifierMask];
 
         if ([anEvent _triggersKeyEquivalent:[item keyEquivalent] withModifierMask:[item keyEquivalentModifierMask]])
         {

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -34,12 +34,12 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
 + (void)initialize
 {
-    if (self !== [_CPMenuBarWindow class])
+    if (self != [_CPMenuBarWindow class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
 
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:[CPFont systemFontSize]];
+    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
 }
 
 + (CPFont)font
@@ -74,7 +74,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
         _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
-        [_titleField setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 1]];
+        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
         [_titleField setAlignment:CPCenterTextAlignment];
         [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
 
@@ -257,7 +257,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
         items = [_menu itemArray],
         count = items.length;
 
-    for (var index = 0; index < count; ++index)
+    for (index = 0; index < count; ++index)
     {
         var item = items[index],
             menuItemView = [item _menuItemView];
@@ -335,7 +335,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
 - (CPFont)font
 {
-    [CPFont systemFontOfSize:[CPFont systemFontSize]];
+    [CPFont systemFontOfSize:12.0];
 }
 
 - (void)tile

AppKit/CPMenu/_CPMenuManager.j

@@ -1,17 +1,16 @@
 @import <Foundation/CPObject.j>
 
 
-_CPMenuManagerScrollingStateUp      = -1;
-_CPMenuManagerScrollingStateDown    = 1;
+_CPMenuManagerScrollingStateUp      = -1,
+_CPMenuManagerScrollingStateDown    = 1,
 _CPMenuManagerScrollingStateNone    = 0;
 
-var STICKY_TIME_INTERVAL            = 0.5,
+var STICKY_TIME_INTERVAL            = 500,
     SharedMenuManager               = nil;
 
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
-    BOOL                _mouseWasDragged;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -61,12 +60,9 @@ var STICKY_TIME_INTERVAL            = 0.5,
 {
     var menu = [aMenuContainer menu];
 
-    if ([menu numberOfItems] <= 0)
-        return;
-
     CPApp._activeMenu = menu;
 
-    _startTime = [anEvent timestamp];
+    _startTime = [anEvent timestamp];//new Date();
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
@@ -91,8 +87,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
             return [self trackMenuBarButtonEvent:anEvent];
     }
 
-    _mouseWasDragged = NO;
-
     [self trackEvent:anEvent];
 }
 
@@ -105,7 +99,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
 
     if (type === CPKeyDown)
     {
@@ -127,7 +121,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     if (_keyBuffer)
     {
-        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
+        if (([CPDate date] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
             [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
 
         if (type === CPPeriodic)
@@ -137,7 +131,10 @@ var STICKY_TIME_INTERVAL            = 0.5,
     // Periodic events don't have a valid location.
     var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
 
-    if (!globalLocation)
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
+
+    if (!_lastGlobalLocation)
         return;
 
     // Find which menu window the mouse is currently on top of
@@ -149,14 +146,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
         activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
-    // unhighlight when mouse is moved off the menu
-    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
-                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
-        [activeMenu _highlightItemAtIndex:CPNotFound];
-
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
-
     // If the item isn't enabled its as if we clicked on nothing.
     if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
     {
@@ -166,7 +155,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     var mouseOverMenuView = [activeItem view];
 
-    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
+    if (type === CPScrollWheel)
         [activeMenuContainer scrollByDelta:[anEvent deltaY]];
 
     if (type === CPPeriodic)
@@ -194,7 +183,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
         var menuContainerWindow = activeMenuContainer;
 
-        if (![menuContainerWindow isKindOfClass:CPWindow])
+        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
             menuContainerWindow = [menuContainerWindow window];
 
         [menuContainerWindow
@@ -216,14 +205,10 @@ var STICKY_TIME_INTERVAL            = 0.5,
             _lastMouseOverMenuView = nil;
         }
 
-        if (activeItemIndex != CPNotFound)
-            [activeMenu _highlightItemAtIndex:activeItemIndex];
+        [activeMenu _highlightItemAtIndex:activeItemIndex];
 
         if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
         {
-            if (type === CPLeftMouseDragged)
-                _mouseWasDragged = YES;
-
             var oldScrollingState = _scrollingState;
 
             _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -236,38 +221,8 @@ var STICKY_TIME_INTERVAL            = 0.5,
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
-        {
-            /*
-                There are a few possibilites:
-
-                1. The user clicks and releases without dragging within the sticky time.
-                   This is considered a regular mouse click and not a drag. In this case
-                   we allow the user to track the menu by moving the mouse. The next
-                   mouse up will end tracking.
-
-                2. The user clicks and releases without dragging after the sticky time.
-                   This is considered a drag and release and tracking ends.
-
-                3. The user clicks, drags and then releases. Tracking ends.
-            */
-            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            {
-                /*
-                    Close the menu if:
-
-                    1. The mouse was dragged.
-                    2. The mouse is released in the menubar.
-                    3. The current item has a submenu with a custom action.
-                */
-                if (_mouseWasDragged ||
-                    [activeMenuContainer isMenuBar] ||
-                    [activeItem action] !== @selector(submenuAction:))
-                {
-                    [trackingMenu cancelTracking];
-                }
-            }
-        }
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] * 5)))
+            [trackingMenu cancelTracking];
     }
 
     // Prevent previous selected menu items from opening by stopping the timer if a
@@ -279,7 +234,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
     }
 
     // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:))
+    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
     {
         var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
             newMenuOrigin;
@@ -351,7 +306,11 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
@@ -420,8 +379,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
     var count = _menuContainerStack.length,
         index = count;
 
-    [newMenu _menuWillOpen];
-
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -433,7 +390,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
             break;
 
         // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu) //&& [menu supermenu] === baseMenu)
+        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
             return [newMenu _highlightItemAtIndex:CPNotFound];
 
         [menuContainer orderOut:self];
@@ -441,8 +398,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
     }
 
     if (!newMenu)
@@ -479,7 +434,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
         var iter = [selectorNames objectEnumerator],
             obj;
 
-        while ((obj = [iter nextObject]) !== nil)
+        while (obj = [iter nextObject])
         {
             var aSelector = CPSelectorFromString(obj);
 
@@ -491,7 +446,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
     {
         if (!_keyBuffer)
         {
-            _startTime = [anEvent timestamp];
+            _startTime = [CPDate date];
             _keyBuffer = character;
 
             [CPEvent stopPeriodicEvents];
@@ -510,7 +465,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
     var iter = [[menu itemArray] objectEnumerator],
         obj;
 
-    while ((obj = [iter nextObject]) !== nil)
+    while (obj = [iter nextObject])
     {
         if ([obj isHidden] || ![obj isEnabled])
             continue;
@@ -528,7 +483,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
         _keyBuffer = Nil;
     }
     else
-        _startTime = [CPEvent currentTimestamp];
+        _startTime = [CPDate date];
 }
 
 - (void)scrollToBeginningOfDocument:(CPMenu)menu
@@ -672,11 +627,8 @@ var STICKY_TIME_INTERVAL            = 0.5,
     var index = menu._highlightedIndex - 1;
 
     if (index < 0)
-    {
-        if (index != CPNotFound)
-            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
         return;
-    }
+
     [menu _highlightItemAtIndex:index];
 
     var item = [menu highlightedItem];

AppKit/CPMenu/_CPMenuWindow.j

@@ -65,7 +65,7 @@ var STICKY_TIME_INTERVAL        = 500,
 
 + (void)initialize
 {
-    if (self !== [_CPMenuWindow class])
+    if (self != [_CPMenuWindow class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
@@ -110,6 +110,8 @@ var STICKY_TIME_INTERVAL        = 500,
         [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
 
         [contentView addSubview:_moreBelowView];
+
+        [self setShadowStyle:CPWindowShadowStyleMenu];
     }
 
     return self;

AppKit/CPMenuItem/CPMenuItem.j

@@ -148,6 +148,14 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
     @param isEnabled \c YES enables the item. \c NO disables it.
 */
 - (void)setEnabled:(BOOL)isEnabled
+{
+    if ([_menu autoenablesItems])
+        return;
+
+    [self _setEnabled:isEnabled];
+}
+
+- (void)_setEnabled:(BOOL)isEnabled
 {
     if (_isEnabled === isEnabled)
         return;
@@ -281,7 +289,7 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
 */
 - (void)setFont:(CPFont)aFont
 {
-    if ([_font isEqual:aFont])
+    if (_font == aFont)
         return;
 
     _font = aFont;
@@ -488,7 +496,6 @@ CPOffState
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
-        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];
@@ -932,33 +939,34 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
         _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];
 
         _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
-        _isHidden = [aCoder decodeBoolForKey:CPMenuItemIsHiddenKey];
-        _tag = [aCoder decodeIntForKey:CPMenuItemTagKey];
-        _state = [aCoder decodeIntForKey:CPMenuItemStateKey];
+        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
+        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
+        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
 
-        _image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
-        _alternateImage = [aCoder decodeObjectForKey:CPMenuItemAlternateImageKey];
+        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
+        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
 //    CPImage         _onStateImage;
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;
 
         // This order matters because setSubmenu: needs _menu to be around.
-        _menu = [aCoder decodeObjectForKey:CPMenuItemMenuKey];
-        [self setSubmenu:[aCoder decodeObjectForKey:CPMenuItemSubmenuKey]];
+        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
+        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
 
         _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPMenuItemKeyEquivalentModifierMaskKey];
+        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
 
 //    int             _mnemonicLocation;
 
 //    BOOL            _isAlternate;
 
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey]];
+        // Default is 0.
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
 
 //    CPString        _toolTip;
 
-        _representedObject = [aCoder decodeObjectForKey:CPMenuItemRepresentedObjectKey];
-        _view = [aCoder decodeObjectForKey:CPMenuItemViewKey];
+        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
+        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
     }
 
     return self;

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -148,8 +148,10 @@ var SelectionColor                              = nil,
         [_submenuIndicatorView setFrame:submenuViewFrame];
     }
 
+    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
+
     [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + HORIZONTAL_MARGIN, height)];
+    [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
 }
 

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -6,14 +6,14 @@ var LEFT_MARGIN                 = 3.0,
     STATE_COLUMN_WIDTH          = 14.0,
     INDENTATION_WIDTH           = 17.0,
     VERTICAL_MARGIN             = 4.0,
-
+    
     RIGHT_COLUMNS_MARGIN        = 30.0,
     KEY_EQUIVALENT_MARGIN       = 10.0;
 
 var SUBMENU_INDICATOR_COLOR                     = nil,
     _CPMenuItemSelectionColor                   = nil,
     _CPMenuItemTextShadowColor                  = nil,
-
+    
     _CPMenuItemDefaultStateImages               = [],
     _CPMenuItemDefaultStateHighlightedImages    = [];
 
@@ -43,9 +43,9 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 
     _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
     _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-
+    
     var bundle = [CPBundle bundleForClass:self];
-
+    
     _CPMenuItemDefaultStateImages[CPOffState]               = nil;
     _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
 
@@ -74,7 +74,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     {
         _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
 
-        [_stateView setImageScaling:CPImageScaleNone];
+        [_stateView setImageScaling:CPScaleNone];
 
         [self addSubview:_stateView];
 
@@ -175,7 +175,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
         [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
         [_keyEquivalentView sizeToFit];
-
+        
         var keyEquivalentViewFrame = [_keyEquivalentView frame];
 
         keyEquivalentViewFrame.origin.x = x;
@@ -215,7 +215,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
         [_keyEquivalentView setFrame:keyEquivalentViewFrame];
     }
-
+    
     if (hasSubmenu)
     {
         submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
@@ -223,7 +223,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     }
 
     _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
-
+    
     [self setAutoresizesSubviews:NO];
     [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
@@ -233,7 +233,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
     // FIXME: This should probably be even throw.
     if (![_menuItem isEnabled])
-        return;
+        return; 
 
     if (shouldHighlight)
     {
@@ -259,7 +259,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
     }
-
+    
     if ([[_menuItem menu] showsStateColumn])
     {
         if (shouldHighlight)
@@ -290,15 +290,15 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds];
-
+    
     CGContextBeginPath(context);
-
+    
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-
+    
     CGContextClosePath(context);
-
+    
     CGContextSetFillColor(context, _color);
     CGContextFillPath(context);
 }

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -40,7 +40,7 @@ var _CPMenuItemSelectionColor                   = nil,
 
 + (void)initialize
 {
-    if (self !== [_CPMenuItemView class])
+    if (self != [_CPMenuItemView class])
         return;
 
     _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
@@ -176,7 +176,7 @@ var _CPMenuItemSelectionColor                   = nil,
 
 - (void)setFont:(CPFont)aFont
 {
-    if ([_font isEqual:aFont])
+    if (_font === aFont)
         return;
 
     _font = aFont;

AppKit/CPObjectController.j

@@ -51,9 +51,6 @@
 
 + (id)initialize
 {
-    if (self !== [CPObjectController class])
-        return;
-
     [self exposeBinding:@"editable"];
     [self exposeBinding:@"contentObject"];
 }
@@ -134,8 +131,8 @@
 
     _contentObject = aContent;
 
-    [self _selectionDidChange];
     [self didChangeValueForKey:@"contentObject"];
+    [self _selectionDidChange];
 }
 
 /*!
@@ -374,7 +371,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
         [self setObjectClass:objectClass || [CPMutableDictionary class]];
         [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
-        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey] || NO];
         [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];
 
         _observedKeys = [[CPCountedSet alloc] init];
@@ -582,8 +579,6 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObjectAtIndex:(unsigned)anIndex
 {
-    var currentObject = [self objectAtIndex:anIndex];
-
     for (var i = 0, count = [_observationProxies count]; i < count; i++)
     {
         var proxy = [_observationProxies objectAtIndex:i],
@@ -593,7 +588,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         if (operator)
             [self willChangeValueForKey:keyPath];
 
-        [currentObject removeObserver:proxy forKeyPath:keyPath];
+        [anObject removeObserver:proxy forKeyPath:keyPath];
 
         if (operator)
             [self didChangeValueForKey:keyPath];
@@ -668,8 +663,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var count = [theValues count],
-        value;
+    var count = [theValues count];
 
     if (!count)
         value = CPNoSelectionMarker;
@@ -683,7 +677,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         {
             value = [theValues objectAtIndex:0];
 
-            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
+            for (var i = 0, count= [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
             {
                 if (![value isEqual:[theValues objectAtIndex:i]])
                     value = CPMultipleValuesMarker;
@@ -699,8 +693,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
-        value = [self _controllerMarkerForValues:values];
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
+    value = [self _controllerMarkerForValues:values];
 
     [_cachedValues setObject:value forKey:theKeyPath];
 
@@ -782,7 +776,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [proxy setNotifyObject:YES];
     [_observationProxies addObject:proxy];
 
-    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
+    // We keep are reference to the observed objects
+    // because the removeObserver: will be called after the selection changes
     var observedObjects = [_controller selectedObjects];
     _observedObjectsByKeyPath[aKeyPath] = observedObjects;
     [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];

AppKit/CPOutlineView.j

@@ -62,7 +62,7 @@ var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_
     CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                                 = 1 << 12,
     CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 13,
     CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                                      = 1 << 14,
-    CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_                    = 1 << 15,
+    CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                                 = 1 << 15,
     CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_                   = 1 << 16,
     CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_                          = 1 << 17,
     CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_             = 1 << 18,
@@ -80,10 +80,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     CPOutlineViewCoalesceSelectionNotificationStateOn   = 1,
     CPOutlineViewCoalesceSelectionNotificationStateDid  = 2;
 
-#define SELECTION_SHOULD_CHANGE(anOutlineView) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_selectionShouldChangeInOutlineView_) || [(anOutlineView)._outlineViewDelegate selectionShouldChangeInOutlineView:(anOutlineView)])
-
-#define SHOULD_SELECT_ITEM(anOutlineView, anItem) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_) || [(anOutlineView)._outlineViewDelegate outlineView:(anOutlineView) shouldSelectItem:(anItem)])
-
 /*!
     @ingroup appkit
     @class CPOutlineView
@@ -140,7 +136,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleSourceList;
 
         // The root item has weight "0", thus represents the weight solely of its descendants.
-        _rootItemInfo = { isExpanded:YES, isExpandable:NO, shouldShowOutlineDisclosureControl:NO, level:-1, row:-1, children:[], weight:0 };
+        _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
 
         _itemsForRows = [];
         _itemInfosForItems = { };
@@ -151,6 +147,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
         _retargedChildIndex = nil;
         _shouldRetargetChildIndex = NO;
+        _startHoverTime = nil;
 
         [self setIndentationPerLevel:16.0];
         [self setIndentationMarkerFollowsDataView:YES];
@@ -297,19 +294,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return itemInfo.isExpandable;
 }
 
-- (BOOL)_shouldShowOutlineDisclosureControlForItem:(id)anItem
-{
-    if (!anItem)
-        return YES;
-
-    var itemInfo = _itemInfosForItems[[anItem UID]];
-
-    if (!itemInfo)
-        return YES;
-
-    return itemInfo.shouldShowOutlineDisclosureControl;
-}
-
 /*!
     Used to find if an item is already expanded.
 
@@ -376,8 +360,9 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         var previousRowCount = [self numberOfRows];
 
         itemInfo.isExpanded = YES;
-        [self reloadItem:anItem reloadChildren:YES];
+        // XXX Shouldn't the items reload before the notification is sent?
         [self _noteItemDidExpand:anItem];
+        [self reloadItem:anItem reloadChildren:YES];
 
         // Shift selection indexes below so that the same items remain selected.
         var rowCountDelta = [self numberOfRows] - previousRowCount;
@@ -468,8 +453,9 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     }
     itemInfo.isExpanded = NO;
 
-    [self reloadItem:anItem reloadChildren:YES];
+    // XXX Shouldn't the items reload before the notification is sent?
     [self _noteItemDidCollapse:anItem];
+    [self reloadItem:anItem reloadChildren:YES];
 
     // Send selection notifications only after the items have loaded so that
     // the new selection is consistent with the actual rows for any observers.
@@ -704,13 +690,11 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (CGRect)frameOfOutlineDisclosureControlAtRow:(CPInteger)aRow
 {
-    var theItem = [self itemAtRow:aRow];
-    if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
+    if (![self isExpandable:[self itemAtRow:aRow]])
         return _CGRectMakeZero();
 
     var dataViewFrame = [self _frameOfOutlineDataViewAtRow:aRow],
-        disclosureWidth = _CGRectGetWidth([_disclosureControlPrototype frame]),
-        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - disclosureWidth, _CGRectGetMinY(dataViewFrame), disclosureWidth, _CGRectGetHeight(dataViewFrame));
+        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - 10, _CGRectGetMinY(dataViewFrame), 10, _CGRectGetHeight(dataViewFrame));
 
     return frame;
 }
@@ -838,24 +822,29 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                           name:CPOutlineViewSelectionIsChangingNotification
                         object:self];
 
+
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemWillExpandNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidExpand:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemDidExpandNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillCollapse:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemWillCollapseNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidCollapse:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
@@ -881,7 +870,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                      , @selector(outlineView:shouldReorderColumn:toColumn:),
             CPOutlineViewDelegate_outlineView_shouldSelectItem_                                  , @selector(outlineView:shouldSelectItem:),
             CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                           , @selector(outlineView:shouldSelectTableColumn:),
-            CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_         , @selector(outlineView:shouldShowOutlineDisclosureControlForItem:),
+            CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                      , @selector(outlineView:shouldShowOutlineViewForItem:),
             CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_        , @selector(outlineView:shouldShowViewExpansionForTableColumn:item:),
             CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_               , @selector(outlineView:shouldTrackView:forTableColumn:item:),
             CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_  , @selector(outlineView:shouldTypeSelectForEvent:withCurrentSearchString:),
@@ -932,6 +921,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             name:CPOutlineViewSelectionIsChangingNotification
             object:self];
 
+
     if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
         [defaultCenter
             addObserver:_outlineViewDelegate
@@ -994,7 +984,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     _disclosureControlData = nil;
     _disclosureControlQueue = [];
 
-    // FIXME: really?
+    // fIXME: really?
     [self reloadData];
 }
 
@@ -1130,14 +1120,13 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         if (_dragHoverTimer)
             [_dragHoverTimer invalidate];
 
-        var autoExpandCallBack = function()
-        {
+        var autoExpandCallBack = function(){
             if (_dropItem)
             {
                 [_dropOperationFeedbackView blink];
                 [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO];
             }
-        };
+        }
 
         _dragHoverTimer = [CPTimer scheduledTimerWithTimeInterval:.8 callback:autoExpandCallBack repeats:NO];
     }
@@ -1295,12 +1284,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             item = _itemsForRows[row],
             isExpandable = [self isExpandable:item];
 
-        if (!isExpandable)
-            continue;
-
-        var disclosureControlFrame = [self frameOfOutlineDisclosureControlAtRow:row];
-
-        if (_CGRectIsEmpty(disclosureControlFrame))
+       if (!isExpandable)
             continue;
 
         var control = [self _dequeueDisclosureControl];
@@ -1310,7 +1294,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
         var selector = [self isRowSelected:row] ? @"setThemeState:" : @"unsetThemeState:";
         [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
-        [control setFrame:disclosureControlFrame];
+        [control setFrame:[self frameOfOutlineDisclosureControlAtRow:row]];
 
         [self addSubview:control];
     }
@@ -1363,7 +1347,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         [self collapseItem:item];
 
     else
-        [self expandItem:item expandChildren:([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask)];
+        [self expandItem:item];
 }
 
 /*!
@@ -1474,62 +1458,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                     userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
-- (void)keyDown:(CPEvent)anEvent
-{
-    var character = [anEvent charactersIgnoringModifiers],
-        modifierFlags = [anEvent modifierFlags];
-
-    // Check for the key events manually, as opposed to waiting for CPWindow to sent the actual action message
-    // in _processKeyboardUIKey:, because we might not want to handle the arrow events.
-
-    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey)
-        return [super keyDown:anEvent];
-
-    var rows = [self selectedRowIndexes],
-        indexes = [],
-        items = [];
-
-    [rows getIndexes:indexes maxCount:-1 inIndexRange:nil];
-
-    var i = 0,
-        c = [indexes count];
-
-    for (; i < c; i++)
-        items.push([self itemAtRow:indexes[i]]);
-
-    if (character === CPRightArrowFunctionKey)
-    {
-        for (var i = 0; i < c; i++)
-            [self expandItem:items[i]];
-    }
-    else if (character === CPLeftArrowFunctionKey)
-    {
-        // When a single, collapsed item is selected and the left arrow key is pressed, the parent
-        // should be selected if possible.
-        if (c == 1)
-        {
-            var theItem = items[0];
-            if (![self isItemExpanded:theItem])
-            {
-                var parent = [self parentForItem:theItem],
-                    shouldSelect = parent && SELECTION_SHOULD_CHANGE(self) && SHOULD_SELECT_ITEM(self, parent);
-                if (shouldSelect)
-                {
-                    var rowIndex = [self rowForItem:parent];
-                    [self selectRowIndexes:[CPIndexSet indexSetWithIndex:rowIndex] byExtendingSelection:NO];
-                    [self scrollRowToVisible:rowIndex];
-                    return;
-                }
-            }
-        }
-
-        for (var i = 0; i < c; i++)
-            [self collapseItem:items[i]];
-    }
-
-    [super keyDown:anEvent];
-}
-
 @end
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1568,9 +1496,8 @@ var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)
 
         itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
         itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
-        itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:newItem];
     }
-};
+}
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
 var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
@@ -1594,7 +1521,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
                 return [];
 
             itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
-            itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:anItem];
 
             // If we were previously expanded, but now no longer expandable, "de-expand".
             // NOTE: we are *not* collapsing, thus no notification is posted.
@@ -1625,7 +1551,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
                 if (!childItemInfo)
                 {
-                    childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
+                    childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
                     itemInfosForItems[[childItem UID]] = childItemInfo;
                 }
 
@@ -1676,7 +1602,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         }
     }//end of with
     return descendants;
-};
+}
 
 @implementation _CPOutlineViewTableViewDataSource : CPObject
 {
@@ -1828,9 +1754,9 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     var dataView = nil;
 
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-        dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
-                                       dataViewForTableColumn:theTableColumn
-                                                         item:[_outlineView itemAtRow:theRow]];
+            dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
+                                           dataViewForTableColumn:theTableColumn
+                                                             item:[_outlineView itemAtRow:theRow]];
 
     if (!dataView)
         dataView = [theTableColumn dataViewForRow:theRow];
@@ -1840,12 +1766,10 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
 - (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
 {
-    return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
-}
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectItem:[_outlineView itemAtRow:theRow]];
 
-- (BOOL)selectionShouldChangeInTableView:(CPTableView)theTableView
-{
-    return SELECTION_SHOULD_CHANGE(_outlineView);
+    return YES;
 }
 
 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
@@ -1889,9 +1813,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         return [_outlineView._outlineViewDelegate outlineView:_outlineView menuForTableColumn:aTableColumn item:item]
     }
 
-    // We reimplement CPView menuForEvent: because we can't call it directly. CPTableView implements menuForEvent:
-    // to call this delegate method.
-    return [_outlineView menu] || [[_outlineView class] defaultMenu];
+    return nil;
 }
 
 @end
@@ -1925,22 +1847,16 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 - (void)drawRect:(CGRect)aRect
 {
     var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextBeginPath(context);
 
-    if (_angle)
-    {
-        var centre = _CGPointMake(FLOOR(width / 2.0), FLOOR(height / 2.0));
-        CGContextTranslateCTM(context, centre.x, centre.y);
-        CGContextRotateCTM(context, _angle);
-        CGContextTranslateCTM(context, -centre.x, -centre.y);
-    }
+    CGContextTranslateCTM(context, _CGRectGetWidth(bounds) / 2.0, _CGRectGetHeight(bounds) / 2.0);
+    CGContextRotateCTM(context, _angle);
+    CGContextTranslateCTM(context, -_CGRectGetWidth(bounds) / 2.0, -_CGRectGetHeight(bounds) / 2.0);
 
     // Center, but crisp.
-    CGContextTranslateCTM(context, FLOOR((width - 9.0) / 2.0), FLOOR((height - 8.0) / 2.0));
+    CGContextTranslateCTM(context, FLOOR((_CGRectGetWidth(bounds) - 9.0) / 2.0), FLOOR((_CGRectGetHeight(bounds) - 8.0) / 2.0));
 
     CGContextMoveToPoint(context, 0.0, 0.0);
     CGContextAddLineToPoint(context, 9.0, 0.0);
@@ -1953,14 +1869,20 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
             [self hasThemeState:CPThemeStateHighlighted]));
     CGContextFillPath(context);
 
+
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, 0.0, 0.0);
 
-    CGContextAddLineToPoint(context, 4.5, 8.0);
     if (_angle === 0.0)
+    {
+        CGContextAddLineToPoint(context, 4.5, 8.0);
         CGContextAddLineToPoint(context, 9.0, 0.0);
+    }
 
-    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.7]);
+    else
+        CGContextAddLineToPoint(context, 4.5, 8.0);
+
+    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.8]);
     CGContextStrokePath(context);
 }
 
@@ -2024,8 +1946,7 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"
 @end
 
 
-var colorForDisclosureTriangle = function(isSelected, isHighlighted)
-{
+var colorForDisclosureTriangle = function(isSelected, isHighlighted) {
     return isSelected
         ? (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.9 alpha: 1.0]
@@ -2033,4 +1954,4 @@ var colorForDisclosureTriangle = function(isSelected, isHighlighted)
         : (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.4 alpha: 1.0]
             : [CPColor colorWithCalibratedWhite:0.5 alpha: 1.0]);
-};
+}

AppKit/CPPanel.j

@@ -114,9 +114,4 @@ CPDocModalWindowMask    = 1 << 6;
     return NO;
 }
 
-- (BOOL)canBecomeKeyWindow
-{
-  return YES;
-}
-
 @end

AppKit/CPPasteboard.j

@@ -73,7 +73,7 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self !== [CPPasteboard class])
+    if (self != [CPPasteboard class])
         return;
 
     [self setVersion:1.0];

AppKit/CPPopUpButton.j

@@ -20,13 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPGeometry.j>
-
 @import "CPButton.j"
-@import "CPKeyValueBinding.j"
+@import "CPGeometry.j"
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 
+
 var VISIBLE_MARGIN = 7.0;
 
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
@@ -87,7 +86,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
         [self setPullsDown:shouldPullDown];
 
-        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld; // | CPKeyValueObservingOptionInitial;
+        var options = CPKeyValueObservingOptionNew |CPKeyValueObservingOptionOld;/* |CPKeyValueObservingOptionInitial;*/
         [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
         [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
         [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
@@ -194,7 +193,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 - (void)removeAllItems
 {
     [[self menu] removeAllItems];
-    [self synchronizeTitleAndSelectedItem];
 }
 
 /*!
@@ -247,6 +245,22 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     return _selectedIndex;
 }
 
+/*!
+    @ignore
+*/
+- (int)selectedTag
+{
+    return [[self selectedItem] tag];
+}
+
+/*!
+    @ignore
+*/
+- (void)_setSelectedTag:(int)aTag
+{
+    [self selectItemWithTag:aTag];
+}
+
 // Setting the Current Selection
 /*!
     Selects the specified menu item.
@@ -572,18 +586,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             if ([indexes containsIndex:0] && [self pullsDown])
                 [self _firstItemDidChange];
 
-            if (![self pullsDown] && [indexes containsIndex:indexOfSelectedItem])
-            {
-                // If the selected item is removed the first item becomes selected.
-                indexOfSelectedItem = 0;
-            }
-            else
-            {
-                // See whether the index has changed, despite the actual item not changing.
-                while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                        index <= indexOfSelectedItem)
-                    --indexOfSelectedItem;
-            }
+            // See whether the index has changed, despite the actual item not changing.
+            while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                    index <= indexOfSelectedItem)
+                --indexOfSelectedItem;
 
             [self selectItemAtIndex:indexOfSelectedItem];
         }
@@ -769,286 +775,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             [[self selectedItem] setState:CPOffState];
 }
 
-- (void)_reverseSetBinding
-{
-    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
-
-    [super _reverseSetBinding];
-}
-
-@end
-
-@implementation CPPopUpButton (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectedIndexBinding ||
-        aBinding == CPSelectedObjectBinding ||
-        aBinding == CPSelectedTagBinding ||
-        aBinding == CPSelectedValueBinding ||
-        aBinding == CPContentBinding ||
-        aBinding == CPContentObjectsBinding ||
-        aBinding == CPContentValuesBinding)
-    {
-        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
-
-        return [CPClassFromString(@"_CPPopUpButton" + capitalizedBinding + "Binder") class];
-    }
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-@end
-
-@implementation _CPPopUpButtonContentBinder : CPBinder
-{
-}
-
-- (CPInteger)_getInsertNullOffset
-{
-    var options = [_info objectForKey:CPOptionsKey];
-
-    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
-}
-
-- (CPString)_getNullPlaceholder
-{
-    var options = [_info objectForKey:CPOptionsKey],
-        placeholder = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
-
-    if (placeholder === [CPNull null])
-        placeholder = @"";
-
-    return placeholder;
-}
-
-- (id)transformValue:(CPArray)contentArray withOptions:(CPDictionary)options
-{
-    // Desactivate the full array transformation forced by super because we don't want this. We want individual transformations (see below).
-    return contentArray;
-}
-
-- (void)setValue:(CPArray)contentArray forBinding:(CPString)aBinding
-{
-    [self _setContent:contentArray];
-    [self _setContentValuesIfNeeded:contentArray];
-}
-
-- (void)valueForBinding:(CPString)aBinding
-{
-    return [self _content];
-}
-
-- (void)_setContent:(CPArray)aValue
-{
-    var count = [aValue count],
-        options = [_info objectForKey:CPOptionsKey],
-        offset = [self _getInsertNullOffset];
-
-    if (count + offset != [_source numberOfItems])
-    {
-        [_source removeAllItems];
-
-        if (offset)
-            [_source addItemWithTitle:[self _getNullPlaceholder]];
-
-        for (var i = 0; i < count; i++)
-        {
-            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil];
-            [self _setValue:[aValue objectAtIndex:i] forItem:item withOptions:options];
-            [_source addItem:item];
-        }
-    }
-    else
-    {
-        for (var i = 0; i < count; i++)
-        {
-            [self _setValue:[aValue objectAtIndex:i] forItem:[_source itemAtIndex:i + offset] withOptions:options];
-        }
-    }
-}
-
-- (void)_setContentValuesIfNeeded:(CPArray)values
-{
-    var offset = [self _getInsertNullOffset];
-
-    if (![_source infoForBinding:CPContentValuesBinding])
-    {
-        if (offset)
-            [[_source itemAtIndex:0] setTitle:[self _getNullPlaceholder]];
-
-        var count = [values count];
-
-        for (var i = 0; i < count; i++)
-            [[_source itemAtIndex:i + offset] setTitle:[[values objectAtIndex:i] description]];
-    }
-}
-
-- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
-{
-    var value = [self _transformValue:aValue withOptions:options];
-    [aMenuItem setRepresentedObject:value];
-}
-
-- (id)_transformValue:(id)aValue withOptions:(CPDictionary)options
-{
-    return [super transformValue:aValue withOptions:options];
-}
-
-- (CPArray)_content
-{
-    return [_source valueForKeyPath:@"itemArray.representedObject"];
-}
-
-@end
-
-@implementation _CPPopUpButtonContentValuesBinder : _CPPopUpButtonContentBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [super _setContent:aValue];
-}
-
-- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
-{
-    if (aValue === [CPNull null])
-        aValue = nil;
-
-    var value = [self _transformValue:aValue withOptions:options];
-    [aMenuItem setTitle:value];
-}
-
-- (CPArray)_content
-{
-    return [_source valueForKeyPath:@"itemArray.title"];
-}
-
-@end
-
-var binderForObject = {};
-
-@implementation _CPPopUpButtonSelectionBinder : CPBinder
-{
-    CPString _selectionBinding @accessors;
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        binderForObject[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = binderForObject[[aSource UID]];
-    [binder reverseSetValueFor:[binder _selectionBinding]];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [self setValue:aValue forBinding:aBinding];
-}
-
-- (CPInteger)_getInsertNullOffset
-{
-    var options = [[CPBinder infoForBinding:CPContentBinding forObject:_source] objectForKey:CPOptionsKey];
-
-    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedIndexBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemAtIndex:aValue + [self _getInsertNullOffset]];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source indexOfSelectedItem] - [self _getInsertNullOffset];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedObjectBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    var index = [_source indexOfItemWithRepresentedObject:aValue],
-        offset = [self _getInsertNullOffset];
-
-    // If the content binding has the option CPNullPlaceholderBindingOption and the object to select is nil, select the first item (i.e., the placeholder).
-    // Other cases to consider:
-    // 1. no binding:
-    // 1.1 there's no item with a represented object matching the object to select.
-    // 1.2 the object to select is nil/CPNull
-    // 2. there's a binding:
-    // 2.1 there's a CPNullPlaceholderBindingOption:
-    // 2.1.1 there's no item with a represented object matching the object to select?
-    // 2.1.2 the object to select is nil/CPNull
-    // 2.2 there's no CPNullPlaceholderBindingOption:
-    // 2.2.1 there's no item with a represented object matching the object to select?
-    // 2.2.2 the object to select is nil/CPNull
-    // More cases? Behaviour that depends on array controller settings?
-
-    if (offset === 1 && index === CPNotFound)
-        index = 0;
-
-    [_source selectItemAtIndex:index];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedItem] representedObject];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedTagBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemWithTag:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedItem] tag];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedValueBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemWithTitle:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source titleOfSelectedItem];
-}
-
 @end
 
 var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",

AppKit/CPPopover.j

@@ -1,385 +0,0 @@
-/*
- * CPPopover.j
- * AppKit
- *
- * Created by Antoine Mercadal.
- * Copyright 2011 Antoine Mercadal.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPButton.j"
-@import "CPColor.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPResponder.j"
-@import "CPView.j"
-@import "_CPAttachedWindow.j"
-
-
-CPPopoverBehaviorApplicationDefined = 0;
-CPPopoverBehaviorTransient          = 1;
-CPPopoverBehaviorSemitransient      = 2;
-
-var CPPopoverDelegate_popover_willShow_     = 1 << 0,
-    CPPopoverDelegate_popover_didShow_      = 1 << 1,
-    CPPopoverDelegate_popover_shouldClose_  = 1 << 2,
-    CPPopoverDelegate_popover_willClose_    = 1 << 3,
-    CPPopoverDelegate_popover_didClose_     = 1 << 4;
-
-
-/*! @ingroup appkit
-    @class CPPopover
-
-    This class represent a widget that displays a attached
-    view relative to another one.
-
-    Delegate can implement:
-
-    @code
-    – popoverShouldClose:(CPPopover)aPopOver
-    – popoverWillShow:(CPPopover)aPopOver
-    – popoverDidShow:(CPPopover)aPopOver
-    – popoverWillClose:(CPPopover)aPopOver
-    – popoverDidClose:(CPPopover)aPopOver
-    @endcode
-*/
-@implementation CPPopover : CPResponder
-{
-    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
-    @outlet id                  _delegate               @accessors(getter=delegate);
-
-    BOOL                        _animates               @accessors(property=animates);
-    int                         _appearance             @accessors(property=appearance);
-    int                         _behavior               @accessors(getter=behavior);
-
-    _CPAttachedWindow           _attachedWindow;
-    int                         _implementedDelegateMethods;
-}
-
-
-#pragma mark -
-#pragma mark Initialization
-
-/*!
-    Initialize the CPPopover witn default values
-
-    @returns an initialized CPPopover
-*/
-- (CPPopover)init
-{
-    if (self = [super init])
-    {
-        _animates      = YES;
-        _appearance    = CPPopoverAppearanceMinimal;
-        _behavior      = CPPopoverBehaviorApplicationDefined;
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the current rect of the popover
-
-    @return CGRect representing the frame of the popover
-*/
-- (CGRect)positioningRect
-{
-    if (![_attachedWindow isVisible])
-        return CGRectMakeZero();
-    return [_attachedWindow frame];
-}
-
-/*! Sets the frame of the popover
-    @param aRect the desired frame
-*/
-- (void)setPositioningRect:(CGRect)aRect
-{
-    if (![_attachedWindow isVisible])
-        return;
-    [_attachedWindow setFrame:aRect];
-}
-
-/*!
-    Returns the size of the popover's view
-
-    @return CGSize representing the size of the popover's view
-*/
-- (CGSize)contentSize
-{
-    if (![_attachedWindow isVisible])
-        return CGRectMakeZero();
-    return [[_contentViewController view] frameSize];
-}
-
-/*!
-    Sets the size of of the popover's view
-
-    @param aSize the desired size
-*/
-- (void)setContentSize:(CPSize)aSize
-{
-    [[_contentViewController view] setFrameSize:aSize];
-}
-
-/*!
-    Indicates if CPPopover is visible
-
-    @returns \c YES if visible
-*/
-- (BOOL)isShown
-{
-    return [_attachedWindow isVisible];
-}
-
-/*!
-Set the behavior of the CPPopover. It can be:
-
-- \c CPPopoverBehaviorTransient: the popover will close if another control outside the popover becomes the responder
-- \c CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
-
-@param aBehavior the desired behavior
-*/
-- (void)setBehavior:(int)aBehavior
-{
-    if (_behavior == aBehavior)
-        return;
-
-    _behavior = aBehavior;
-    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
-}
-
-- (void)setDelegate:(id)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverShouldClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_shouldClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didClose_;
-}
-
-#pragma mark -
-#pragma mark Positioning
-
-/*!
-    Show the popover
-
-    @param positioningRect if set, the popover will be positionned to a random rect relative to the window
-    @param positioningView if set, the popover will be positioned relative to this view
-    @param preferredEdge: \c CPRectEdge representing the preferred positioning.
-*/
-- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
-{
-    if (!positioningView)
-        [CPException raise:CPInvalidArgumentException reason:"positionView must not be nil"];
-
-    if (!_contentViewController)
-        [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
-
-    // If the popover is currently closing, do nothing. That is what Cocoa does.
-    if ([_attachedWindow isClosing])
-        return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
-        [_delegate popoverWillShow:self];
-
-    if (!_attachedWindow)
-    {
-        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
-
-        var parentWindow = [positioningView window];
-
-        if (![parentWindow isKindOfClass:_CPAttachedWindow])
-            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:parentWindow];
-    }
-
-    [_attachedWindow setAppearance:_appearance];
-    [_attachedWindow setAnimates:_animates];
-    [_attachedWindow setDelegate:self];
-    [_attachedWindow setMovableByWindowBackground:NO];
-    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_attachedWindow setContentView:[_contentViewController view]];
-    [_attachedWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
-
-    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
-}
-
-- (unsigned)styleMaskForBehavior
-{
-    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
-}
-
-/*!
-    Closes the popover
-*/
-- (void)close
-{
-    [self _close];
-}
-
-/*!
-    Closes the popover
-*/
-- (void)_close
-{
-    if ([_attachedWindow isClosing] || ![self isShown])
-        return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
-        [_delegate popoverWillClose:self];
-
-    [_attachedWindow close];
-
-    // popoverDidClose will be sent from attachedWindowDidClose, since
-    // the attached window will close asynchronously when animating.
-}
-
-
-#pragma mark -
-#pragma mark Action
-
-/*!
-    Close the popover
-
-    @param sender the sender of the action
-*/
-- (IBAction)performClose:(id)sender
-{
-    if ([_attachedWindow isClosing])
-        return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
-        if (![_delegate popoverShouldClose:self])
-            return;
-
-    [self _close];
-}
-
-
-#pragma mark -
-#pragma mark Delegates
-
-/*! @ignore */
-- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
-{
-    [self performClose:self];
-
-    // We return NO, because we want the CPPopover to determine
-    // if the attached window can be closed and to give us a chance
-    // to send delegate messages.
-    return NO;
-}
-
-/*! @ignore */
-- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
-        [_delegate popoverDidClose:self];
-}
-
-/*! @ignore */
-- (void)attachedWindowDidShow:(_CPAttachedWindow)anAttachedWindow
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
-}
-
-
-#pragma mark -
-#pragma mark Notifications
-
-/*!
-    @ignore
-
-    This method is called only when a non-popover parent window
-    is closing. In that case popovers should order out.
-*/
-- (void)parentWindowWillClose:(CPNotification)aNotification
-{
-    [_attachedWindow orderOut:nil];
-    [self performClose:nil];
-}
-
-@end
-
-@implementation CPPopover (Deprecated)
-
-- (void)setBehaviour:(int)aBehavior
-{
-    _CPReportLenientDeprecation(self, _cmd, @selector(setBehavior:));
-
-    [self setBehavior:aBehavior];
-}
-
-@end
-
-var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
-    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
-    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
-    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
-    CPPopoverDelegateKey = @"CPPopoverDelegateKey",
-    CPPopoverBehaviorKey = @"CPPopoverBehaviorKey";
-
-@implementation CPPopover (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _appearance = [aCoder decodeIntForKey:CPPopoverAppearanceKey];
-        _animates = [aCoder decodeBoolForKey:CPPopoverAnimatesKey];
-        _contentViewController = [aCoder decodeObjectForKey:CPPopoverContentViewControllerKey];
-        [self setDelegate:[aCoder decodeObjectForKey:CPPopoverDelegateKey]];
-        [self setBehavior:[aCoder decodeIntForKey:CPPopoverBehaviorKey]];
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_appearance forKey:CPPopoverAppearanceKey];
-    [aCoder encodeBool:_animates forKey:CPPopoverAnimatesKey];
-    [aCoder encodeObject:_contentViewController forKey:CPPopoverContentViewControllerKey];
-    [aCoder encodeObject:_delegate forKey:CPPopoverDelegateKey];
-    [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
-}
-
-@end

AppKit/CPProgressIndicator.j

@@ -71,6 +71,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 
     BOOL                        _isDisplayedWhenStoppedSet;
     BOOL                        _isDisplayedWhenStopped;
+
+    CPView                      _barView;
 }
 
 /*
@@ -78,7 +80,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 */
 + (void)initialize
 {
-    if (self !== [CPProgressIndicator class])
+    if (self != [CPProgressIndicator class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
@@ -86,9 +88,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     CPProgressIndicatorSpinningStyleColors = [];
 
     CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif"] size:CGSizeMake(16.0, 16.0)]];
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
     CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif"] size:CGSizeMake(32.0, 32.0)]];
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
     CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
         [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
 
@@ -120,11 +122,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 
     // Bar Style
     var prefixes = [
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-        ];
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
+    ];
 
     for (var i = 0, count = prefixes.length; i < count; i++)
     {
@@ -408,38 +410,27 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     if (_style == CPProgressIndicatorSpinningStyle)
         return;
 
-    var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                         positioned:CPWindowBelow
-                    relativeToEphemeralSubviewNamed:nil];
+    if (!_barView)
+    {
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];
+        [self addSubview:_barView];
+    }
 
-    [barView setBackgroundColor:_CPControlThreePartImagePattern(
+    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
         NO,
         CPProgressIndicatorStyleSizes,
         CPProgressIndicatorClassName,
         @"Bar",
         CPProgressIndicatorStyleIdentifiers[_style],
         _CPControlIdentifierForControlSize(_controlSize))];
-}
 
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-}
+    var width = CGRectGetWidth([self bounds]),
+        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
 
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
-{
-    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
-    {
-        var width = CGRectGetWidth([self bounds]),
-            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+    if (barWidth > 0.0 && barWidth < 4.0)
+        barWidth = 4.0;
 
-        if (barWidth > 0.0 && barWidth < 4.0)
-            barWidth = 4.0;
-
-        return _CGRectMake(0, 0, barWidth, 16.0);
-    }
-
-    return nil;
+    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
 }
 
 /* @ignore */
@@ -449,10 +440,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     {
         if (_style == CPProgressIndicatorSpinningStyle)
         {
-            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
-            [self layoutEphemeralSubviewNamed:"bar-view"
-                                   positioned:CPWindowBelow
-              relativeToEphemeralSubviewNamed:nil];
+            [_barView removeFromSuperview];
+
+            _barView = nil;
 
             [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
         }
@@ -487,12 +477,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
         _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
         _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
         _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
-        _style                      = [aCoder decodeIntForKey:@"_style"];
+        _style                      = [aCoder decodeObjectForKey:@"_style"];
         _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
         _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
         _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
-
-        [self updateBackgroundColor];
     }
 
     return self;
@@ -500,19 +488,14 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // Don't encode the background colour. It can be recreated based on the flags and if encoded causes hardcoded
-    // image paths in the cib while just wasting space.
-    var backgroundColor = [self backgroundColor];
-    [self setBackgroundColor:nil];
     [super encodeWithCoder:aCoder];
-    [self setBackgroundColor:backgroundColor];
 
     [aCoder encodeObject:_minValue forKey:@"_minValue"];
     [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
     [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
     [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
     [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
-    [aCoder encodeInt:_style forKey:@"_style"];
+    [aCoder encodeObject:_style forKey:@"_style"];
     [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
     [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
     [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];

AppKit/CPRadio.j

@@ -150,14 +150,6 @@ CPRadioImageOffset = 4.0;
         [_radioGroup _setSelectedRadio:self];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    if (_radioGroup)
-        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
-}
-
 @end
 
 var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
@@ -181,23 +173,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
 }
 
-- (CPImage)image
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (CPImage)alternateImage
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    var startedTracking = [super startTrackingAt:aPoint];
-    [self highlight:YES];
-    return startedTracking;
-}
-
 @end
 
 @implementation CPRadioGroup : CPObject
@@ -245,6 +220,8 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
     [_selectedRadio setState:CPOffState];
     _selectedRadio = aRadio;
+
+    [CPApp sendAction:_action to:_target from:self];
 }
 
 - (CPRadio)selectedRadio

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -82,22 +82,6 @@
 }
 
 /*! @cond */
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding)
-        return [CPPredicateEditorValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (id)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"predicate";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
 - (void)_initRuleEditorShared
 {
     [super _initRuleEditorShared];
@@ -173,40 +157,28 @@
     return trees;
 }
 
-- (CPMutableArray)_mergeTree:(CPArray)aTree
+- (id)_mergeTree:(id)tree
 {
-    var mergedTree = [CPMutableArray array];
-    if (aTree == nil)
-        return mergedTree;
+    var merged = [CPMutableArray array],
+        titles = [CPMutableArray array],
+        count = [tree count];
 
-    var icount = [aTree count];
-    for (var i = 0; i < icount; i++)
+    for (var i = 0; i < count; i++)
     {
-        var anode = [aTree objectAtIndex:i],
-            jcount = [mergedTree count],
-            merged = NO;
+        var t = tree[i],
+            title = [CPString stringWithString:[t title]];
 
-        for (var j = 0; j < jcount; j++)
+        if ([titles containsObject:title])
         {
-            var mergednode = [mergedTree objectAtIndex:j];
-
-            if ([[mergednode title] isEqualToString:[anode title]])
-            {
-                var children1 = [mergednode children],
-                    children2 = [anode children],
-                    children12 = [children1 arrayByAddingObjectsFromArray:children2],
-                    mergedChildren = [self _mergeTree:children12];
-
-                [mergednode setChildren:mergedChildren];
-                merged = YES;
-            }
+            CPLogConsole("CPPredicateEditor does not support templates merging yet. Ignoring duplicate template: " + [t description]);
+            continue;
         }
 
-        if (!merged)
-            [mergedTree addObject:anode];
+        [merged addObject:t];
+        [titles addObject:title];
     }
 
-    return mergedTree;
+    return merged;
 }
 
 - (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
@@ -228,7 +200,7 @@
         if (isPopup)
         {
             itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count];
+            itemsCount = [itemArray count],
             menuIndex = 0;
         }
 
@@ -255,19 +227,14 @@
 
 - (void)setObjectValue:(id)objectValue
 {
-    var ov = [self objectValue];
-    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
-    {
-        [self _setPredicate:objectValue];
+    if (![[objectValue predicateFormat] isEqualToString:[[super predicate] predicateFormat]]) // ??
         [self _reflectPredicate:objectValue];
-    }
 }
 
 - (void)_reflectPredicate:(id)predicate
 {
     var animation = _currentAnimation;
     _currentAnimation = nil;
-    _sendAction = NO;
 
     if (predicate != nil)
     {
@@ -344,9 +311,9 @@
             treeChild = [rootItems objectAtIndex:i];
 
             var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
-                title = [treeChild title];
+                menuItemIndex = [treeChild menuItemIndex];
 
-            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
+            if (menuItemIndex == -1 || [[treeChild title] isEqual:[currentView titleOfSelectedItem]])
             {
                 var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
                 [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
@@ -369,15 +336,16 @@
 
 - (void)_updatePredicate
 {
+    [self willChangeValueForKey:@"objectValue"];
     [self _updatePredicateFromRows];
+    [self didChangeValueForKey:@"objectValue"];
 }
 
 - (void)_updatePredicateFromRows
 {
     var rootRowsArray = [super _rootRowsArray],
         subpredicates = [CPMutableArray array],
-        count,
-        count2 = count = [rootRowsArray count],
+        count = count2 = [rootRowsArray count],
         predicate;
 
     while (count--)
@@ -394,7 +362,7 @@
     else
         predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];
 
-    [self _setPredicate:predicate];
+    [super _setPredicate:predicate];
 }
 
 - (id)_predicateFromRowItem:(id)rowItem
@@ -405,13 +373,12 @@
     if (rowType == CPRuleEditorRowTypeCompound)
     {
         var subrows = [rowItem valueForKey:_subrowsArrayKeyPath],
-            count = [subrows count];
+        count = [subrows count];
 
         for (var i = 0; i < count; i++)
         {
-            var subrow = [subrows objectAtIndex:i],
-                predicate = [self _predicateFromRowItem:subrow];
-
+            var subrow = [subrows objectAtIndex:i];
+            var predicate = [self _predicateFromRowItem:subrow];
             [subpredicates addObject:predicate];
         }
     }
@@ -447,6 +414,7 @@
 
 - (void)_sendRuleAction
 {
+    [self _updatePredicate];
     [super _sendRuleAction];
 }
 
@@ -515,11 +483,9 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 - (id)initWithCoder:(id)aCoder
 {
     self = [super initWithCoder:aCoder];
-
     if (self != nil)
     {
         var nibTemplates = [aCoder decodeObjectForKey:CPPredicateTemplatesKey];
-
         if (nibTemplates != nil)
             [self setRowTemplates:nibTemplates];
     }
@@ -535,19 +501,4 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 
 @end
 
-@implementation CPPredicateEditorValueBinder : CPBinder
-{
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:aValue];
-}
-
-@end
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -20,17 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-CPUndefinedAttributeType     = 0;
-CPInteger16AttributeType     = 100;
-CPInteger32AttributeType     = 200;
-CPInteger64AttributeType     = 300;
-CPDecimalAttributeType       = 400;
-CPDoubleAttributeType        = 500;
-CPFloatAttributeType         = 600;
-CPStringAttributeType        = 700;
-CPBooleanAttributeType       = 800;
-CPDateAttributeType          = 900;
-CPBinaryDataAttributeType    = 1000;
+CPUndefinedAttributeType     = 0,
+CPInteger16AttributeType     = 100,
+CPInteger32AttributeType     = 200,
+CPInteger64AttributeType     = 300,
+CPDecimalAttributeType       = 400,
+CPDoubleAttributeType        = 500,
+CPFloatAttributeType         = 600,
+CPStringAttributeType        = 700,
+CPBooleanAttributeType       = 800,
+CPDateAttributeType          = 900,
+CPBinaryDataAttributeType    = 1000,
 CPTransformableAttributeType = 1800;
 
 @implementation CPPredicateEditorRowTemplate : CPObject
@@ -185,8 +185,7 @@ CPTransformableAttributeType = 1800;
         if (![[self operators] containsObject:[predicate predicateOperatorType]])
             return 0;
 
-        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]])
-            return 0;
+        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]]) return 0;
 
         return 1;
     }
@@ -281,7 +280,7 @@ CPTransformableAttributeType = 1800;
 */
 - (CPArray)leftExpressions
 {
-    if (_templateType == 1 && !_leftIsWildcard)
+    if (_templateType ==1 && !_leftIsWildcard)
     {
         var view = [_views objectAtIndex:0];
         return [[view itemArray] valueForKey:@"representedObject"];
@@ -686,7 +685,6 @@ CPTransformableAttributeType = 1800;
     [textField setBordered:YES];
     [textField setEditable:YES];
     [textField setFont:[CPFont systemFontOfSize:10]];
-    [textField setSendsActionOnEndEditing:YES];
 
     return textField;
 }
@@ -787,4 +785,4 @@ var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
 }
 
 @end
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

@@ -14,21 +14,25 @@
 
 + (id)rowNodeFromTree:(id)aTree
 {
-    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}];
+    var mapTable = {};
+    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:mapTable];
 }
 
 + (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
 {
-    var views,
+    var node,
+        views,
         copiedContainer;
 
-    var uuid = [[aTree template] UID],
-        cachedNode = templateTable[uuid],
-        node = [[_CPPredicateEditorRowNode alloc] init];
+    node = [[_CPPredicateEditorRowNode alloc] init];
+    node.tree = aTree;
 
-    [node setTree:aTree];
+    var template = [aTree template],
+        uuid = [template UID];
 
-    if (!cachedNode)
+    var cachedNode = templateTable[uuid];
+
+    if (cachedNode == nil)
     {
         views = [CPMutableArray array];
         copiedContainer = [CPMutableArray array];
@@ -40,8 +44,8 @@
         copiedContainer = [cachedNode copiedTemplateContainer];
     }
 
-    [node setTemplateViews:views];
-    [node setCopiedTemplateContainer:copiedContainer];
+    node.templateViews = views;
+    node.copiedTemplateContainer = copiedContainer;
 
     var nodeChildren = [CPMutableArray array],
         treeChildren = [aTree children],
@@ -62,9 +66,7 @@
 
 - (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate
 {
-    var t = [tree template],
-        count = [children count];
-
+    var t = [tree template];
     if (t !== template)
     {
         [templateViews setArray:views];
@@ -72,7 +74,8 @@
         [copiedTemplateContainer addObject:template];
     }
 
-    for (var i = 0; i < count; i++)
+    var count = [children count];
+    for (var i; i < count; i++)
         [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate];
 }
 
@@ -86,8 +89,9 @@
 
 - (void)copyTemplateIfNecessary
 {
-    if ([copiedTemplateContainer count] === 0)
+    if ([copiedTemplateContainer count] == 0)
     {
+        CPLogConsole("COPYING TEMPLATE");
         var copy = [[tree template] copy];
         [copiedTemplateContainer addObject:copy];
         [templateViews addObjectsFromArray:[copy templateViews]];
@@ -114,8 +118,7 @@
 - (id)displayValue
 {
     var title = [self title];
-
-    if (title !== nil)
+    if (title != nil)
         return title;
 
     return [self templateView];
@@ -126,4 +129,4 @@
     return [CPString stringWithFormat:@"<%@ %@ %@ tree:%@ tviews:%@", [self className],[self UID], [self title], [tree UID], [templateViews description]];
 }
 
-@end
+@end

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -7,7 +7,7 @@
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPString.j>
 
-var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
+var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
 
 @implementation _CPRuleEditorLocalizer : CPObject
 {
@@ -24,10 +24,9 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 
 - (void)reloadIfNeeded
 {
-    if (connection !== nil) // Connection waiting
+    if (connection != nil) // Connection waiting
     {
         connection = nil;
-
         var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
         [self loadContent:[data rawString]];
     }
@@ -35,7 +34,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
 {
-    if (connection !== nil && rawString !== nil)
+    if (connection != nil && rawString != nil)
         [self loadContent:rawString];
 
     connection = nil;
@@ -50,12 +49,10 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
     for (var i = 0 ; i < count ; i++)
     {
         var line = [lines objectAtIndex:i];
-
         if (line.length > 1)
         {
-            var match = LocalizerStringsRegex.exec(line);
-
-            if (match && match.length >= 3)
+            var match = regex.exec(line);
+            if (match.length >= 3)
                 [dict setObject:match[2] forKey:match[1]];
         }
     }
@@ -67,13 +64,12 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 {
     [self reloadIfNeeded];
 
-    if (_dictionary !== nil && aString !== nil)
+    if (_dictionary != nil && aString != nil)
     {
         var localized = [_dictionary objectForKey:aString];
-
-        if (localized !== nil)
-            return localized;
+        if (localized != nil)
+                return localized;
     }
 
     return aString;
-}
+}

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -3,82 +3,62 @@
  *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPPopUpButton.j"
-
-var GRADIENT_START_COLOR = "#fcfcfc",
-    GRADIENT_END_COLOR = "#dfdfdf",
-    BORDER_COLOR = "#BDBDBD";
-
 var GRADIENT_NORMAL,
     GRADIENT_HIGHLIGHTED,
-    GRADIENT_PROPERTY;
-
-if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-{
-    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
-    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
-    GRADIENT_PROPERTY = "background";
-}
-else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-{
-    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
-    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
-    GRADIENT_PROPERTY = "background";
-}
-else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-{
-    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
-    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
-    GRADIENT_PROPERTY = "filter";
-}else
-{
-    GRADIENT_NORMAL = GRADIENT_START_COLOR;
-    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
-    GRADIENT_PROPERTY = "background";
-}
+    IE_FILTER = "progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dfdfdf')";
 
 @implementation _CPRuleEditorPopUpButton : CPPopUpButton
 {
     CPInteger radius;
 }
 
-- (void)_sharedInit
++ (void)initialize
 {
-    [self setBordered:NO];
-
-    var style = _DOMElement.style;
-    style.border = "1px solid " + BORDER_COLOR;
-    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+    {
+        GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(rgb(252, 252, 252)), to(rgb(223, 223, 223)))",
+        GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(rgb(223, 223, 223)), to(rgb(252, 252, 252)))";
+    }
+    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+    {
+        GRADIENT_NORMAL = "-moz-linear-gradient(top,  rgb(252, 252, 252),  rgb(223, 223, 223))",
+        GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top,  rgb(223, 223, 223),  rgb(252, 252, 252))";
+    }
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
+    {
+        var style = _DOMElement.style;
+        style.backgroundImage = GRADIENT_NORMAL;
+        style.border = "1px solid rgb(189, 189, 189)";
+        style.filter = IE_FILTER;
 
-    return self;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
+        [self setTextColor:[CPColor colorWithWhite:101/255 alpha:1]];
+        [self setBordered:NO];
+     }
 
     return self;
 }
 
 - (id)hitTest:(CPPoint)point
 {
+    var slice = [self superview];
     if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
         return nil;
 
     return self;
 }
 
+- (void)setHighlighted:(BOOL)shouldHighlight
+{
+    _DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+}
+
 - (BOOL)sliceIsEditable
 {
-    var superview = [self superview];
-    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
+    return [[self superview] isEditable];
 }
 
 - (BOOL)trackMouse:(CPEvent)theEvent
@@ -100,10 +80,13 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
 - (void)layoutSubviews
 {
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    radius = FLOOR(CGRectGetHeight([self bounds])/2);
+
     var style = _DOMElement.style,
         radiusCSS = radius + "px";
 
+    //style.webkitBorderRadius = radiusCSS;
+    //style.mozBorderRadius = radiusCSS;
     style.borderRadius = radiusCSS;
 
     [super layoutSubviews];
@@ -111,19 +94,20 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
 - (void)drawRect:(CGRect)aRect
 {
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);
+    var bounds = [self bounds],
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    var arrow_width = FLOOR(CGRectGetHeight(bounds)/3.5);
 
     CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
 
     var arrowsPath = [CPBezierPath bezierPath];
     [arrowsPath moveToPoint:CGPointMake(0, 1)];
     [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width/2, arrow_width + 1)];
     [arrowsPath closePath];
 
-    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
+    CGContextSetFillColor(context, [CPColor colorWithWhite:101/255 alpha:1]);
     [arrowsPath fill];
 
     CGContextScaleCTM(context, 1 , -1);
@@ -137,42 +121,37 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     CPInteger radius;
 }
 
-- (void)_sharedInit
-{
-    [self setBordered:NO];
-
-    var style = _DOMElement.style;
-    style.border = "1px solid " + BORDER_COLOR;
-    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
-    if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
-
-    return self;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
+    self = [super initWithFrame:aFrame];
+    if (self)
+    {
+        [self setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
+        [self setTextColor:[CPColor colorWithWhite:150/255 alpha:1]];
+        [self setAlignment:CPCenterTextAlignment];
+        [self setAutoresizingMask:CPViewMinXMargin];
+        [self setImagePosition:CPImageOnly];
+        [self setBordered:NO];
+        var style = _DOMElement.style;
+        style.border = "1px solid rgb(189, 189, 189)";
+        style.filter = IE_FILTER;
+    }
 
     return self;
 }
 
 - (void)layoutSubviews
 {
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    radius = FLOOR(CGRectGetHeight([self bounds])/2);
 
     var style = _DOMElement.style,
         radiusCSS = radius + "px";
 
     style.borderRadius = radiusCSS;
-    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+    style.backgroundImage = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
 
     [super layoutSubviews];
 }
 
 @end
+

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -45,7 +45,7 @@
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds],
-        maxX = CGRectGetWidth(bounds),
+        maxX = CGRectGetWidth(bounds) - 2,
         maxY = CGRectGetHeight(bounds);
 
 // Draw background
@@ -63,7 +63,7 @@
 
 // Draw Top Border
     CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 0, 0);
+    CGContextMoveToPoint(context, 1, 0);
     CGContextAddLineToPoint(context, maxX, 0);
     CGContextClosePath(context);
     CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
@@ -71,8 +71,8 @@
 
 // Draw Bottom Border
     CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 0, maxY);
-    CGContextAddLineToPoint(context, maxX, maxY);
+    CGContextMoveToPoint(context, 1, maxY - 0.5);
+    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
     CGContextClosePath(context);
     var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
     CGContextSetStrokeColor(context, bottomColor);
@@ -106,4 +106,4 @@
     return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
 }
 
-@end
+@end

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -41,8 +41,8 @@ var CONTROL_HEIGHT = 16.,
 
     _addButton = [self _createAddRowButton];
     _subtractButton = [self _createDeleteRowButton];
-    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    //[_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    //[_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
     [_addButton setHidden:!editable];
     [_subtractButton setHidden:!editable];
     [self addSubview:_addButton];
@@ -54,36 +54,26 @@ var CONTROL_HEIGHT = 16.,
     [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
 }
 
-- (CPButton)_createRowButton
-{
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
-    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
-    [button setAlignment:CPCenterTextAlignment];
-    [button setAutoresizingMask:CPViewMinXMargin];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
 - (CPButton)_createAddRowButton
 {
-    var button = [self _createRowButton];
-
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
     [button setImage:[_ruleEditor _addImage]];
+
     [button setAction:@selector(_addOption:)];
     [button setTarget:self];
+    [button setAutoresizingMask:CPViewMinXMargin];
 
     return button;
 }
 
 - (CPButton)_createDeleteRowButton
 {
-    var button = [self _createRowButton];
-
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
     [button setImage:[_ruleEditor _removeImage]];
+
     [button setAction:@selector(_deleteOption:)];
     [button setTarget:self];
+    [button setAutoresizingMask:CPViewMinXMargin];
 
     return button;
 }
@@ -97,14 +87,12 @@ var CONTROL_HEIGHT = 16.,
 
 - (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
 {
-    var title = [[itemsArray objectAtIndex:index] title],
-        font = [_ruleEditor font],
+    var title = [[itemsArray objectAtIndex:index] title];
+    var font = [_ruleEditor font],
         width = [title sizeWithFont:font].width + 20,
-        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
+        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT);
 
-        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
-
-    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
+    var popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
     [popup setValue:font forThemeAttribute:@"font"];
 
     var count = [itemsArray count];
@@ -121,16 +109,15 @@ var CONTROL_HEIGHT = 16.,
     return [CPMenuItem separatorItem];
 }
 
-- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString )text
 {
-    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)],
-        refont = [_ruleEditor font],
-        font = [CPFont fontWithName:[refont familyName] size:[refont size] + 2],
-
-        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
+    text = [[_ruleEditor standardLocalizer] localizedStringForString:text];
 
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)];
+    var font = [_ruleEditor font];
+    font = [CPFont fontWithName:font._name size:font._size + 2];
     [textField setValue:font forThemeAttribute:@"font"];
-    [textField setStringValue:localizedText];
+    [textField setStringValue:text];
     [textField sizeToFit];
 
     return textField;
@@ -195,10 +182,9 @@ var CONTROL_HEIGHT = 16.,
         parent,
         numberOfCriteria,
         numberOfChildren,
-        firstResponderIndex,
+        firstResponderIndex;
 
-        ruleItems = [CPMutableArray array],
-        responder = [[self window] firstResponder];
+    var ruleItems = [CPMutableArray array];
 
     [self _emptyRulePartSubviews];
 
@@ -206,6 +192,7 @@ var CONTROL_HEIGHT = 16.,
     numberOfCriteria = [criteria count];
 
     firstResponderIndex = numberOfCriteria - 1;
+    var responder = [[self window] firstResponder];
     if (responder)
         firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];
 
@@ -226,16 +213,16 @@ var CONTROL_HEIGHT = 16.,
         numberOfChildren = [childItems count];
         if (numberOfChildren > 1)
         {
-            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
-                selectedIndex = [childItems indexOfObject:criterion];
+            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren];
 
+            var selectedIndex = [childItems indexOfObject:criterion];
             if (selectedIndex == CPNotFound)
                 break;
 
             for (var j = 0; j < numberOfChildren; ++j)
             {
-                var childItem = [childItems objectAtIndex:j],
-                    childValue = [childValues objectAtIndex:j];
+                var childItem = [childItems objectAtIndex:j];
+                var childValue = [childValues objectAtIndex:j];
 
                 if ([childValue isKindOfClass:[CPMenuItem class]])
                 {
@@ -263,8 +250,8 @@ var CONTROL_HEIGHT = 16.,
         }
         else
         {
-            var value = [childValues objectAtIndex:0],
-                type = [value valueType];
+            var value = [childValues objectAtIndex:0];
+            var type = [value valueType];
 
             if (type === 0)
                 ruleView = [self _createStaticTextFieldWithStringValue:value];
@@ -321,6 +308,7 @@ var CONTROL_HEIGHT = 16.,
 
 - (void)layoutSubviews
 {
+    // CPLogConsole(_cmd);
     [self _relayoutSubviewsWidthChanged:YES];
 }
 
@@ -331,11 +319,11 @@ var CONTROL_HEIGHT = 16.,
         leftButtonMinX,
         rowHeight = [_ruleEditor rowHeight],
         count = [_ruleOptionViews count],
-        sliceFrame = [self frame],
-
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
+        sliceFrame = [self frame];
 
+    var buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT)/2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
     [_addButton setFrame:buttonFrame];
+
     buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
     [_subtractButton setFrame:buttonFrame];
 
@@ -351,16 +339,7 @@ var CONTROL_HEIGHT = 16.,
         var ruleOptionView = _ruleOptionViews[i],
             optionFrame = _ruleOptionFrames[i];
 
-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
-
-        // small positioning fix
-        if ([ruleOptionView isKindOfClass:CPTextField])
-        {
-            optionFrame.origin.y += 2;
-            [_ruleOptionViews[i] setValue:CGInsetMake(7, 7, 7, 8) forThemeAttribute:@"content-inset"];
-        }
-
-
+        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame))/2 - 2;
         if (widthChanged)
         {
             optionFrame.origin.x = optionViewOriginX;
@@ -439,7 +418,7 @@ var CONTROL_HEIGHT = 16.,
 
 - (float)_rowButtonsRightHorizontalPadding
 {
-    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
+    return 10.;
 }
 
 - (void)_setRowTypeToAddFromPlusButton:(int)type
@@ -494,14 +473,13 @@ var CONTROL_HEIGHT = 16.,
 
 - (void)_sendRuleAction:(id)sender
 {
-    [_ruleEditor _updatePredicate];
     [_ruleEditor _sendRuleAction];
 }
 
 - (void)_textDidChange:(CPNotification)aNotif
 {
     if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
-        [self _sendRuleAction:nil];
+        [_ruleEditor _sendRuleAction];
 }
 
 @end

AppKit/CPScroller.j

@@ -5,9 +5,6 @@
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
  *
- * Modified to match Lion style by Antoine Mercadal 2011
- * <antoine.mercadal@archipelproject.org>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -23,10 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
 @import "CPControl.j"
 
+
 // CPScroller Constants
 CPScrollerNoPart            = 0;
 CPScrollerDecrementPage     = 1;
@@ -58,17 +54,6 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 
-CPScrollerStyleLegacy           = 0;
-CPScrollerStyleOverlay          = 1;
-
-CPScrollerKnobStyleDefault      = 0;
-CPScrollerKnobStyleDark         = 1;
-CPScrollerKnobStyleLight        = 2;
-
-CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
-CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
-CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
-
 @implementation CPScroller : CPControl
 {
     CPControlSize           _controlSize;
@@ -83,19 +68,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
-
-    CPViewAnimation         _animationScroller;
-
-    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
-    int                     _style;
-    CPTimer                 _timerFadeOut;
-    BOOL                    _isMouseOver;
 }
 
-
-#pragma mark -
-#pragma mark Class methods
-
 + (CPString)defaultThemeClass
 {
     return "scroller";
@@ -104,43 +78,49 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 + (id)themeAttributes
 {
     return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 7.0,
-        @"knob-slot-color": [CPNull null],
+        @"scroller-width": 15.0,
+        @"knob-slot-color": [CPColor lightGrayColor],
         @"decrement-line-color": [CPNull null],
         @"increment-line-color": [CPNull null],
-        @"knob-color": [CPNull null],
+        @"knob-color": [CPColor grayColor],
         @"decrement-line-size":_CGSizeMakeZero(),
         @"increment-line-size":_CGSizeMakeZero(),
         @"track-inset":_CGInsetMakeZero(),
         @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0,
-        @"track-border-overlay": 9.0
-    }];
+        @"minimum-knob-length":21.0
+    }]
 }
 
-+ (float)scrollerWidth
+
+// Calculating Layout
+
+- (id)initWithFrame:(CGRect)aFrame
 {
-    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+
+    return self;
 }
 
+// Determining CPScroller Size
 /*!
     Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidthInStyle:(int)aStyle
++ (float)scrollerWidth
 {
-    var scroller = [[self alloc] init];
-
-    if (aStyle == CPScrollerStyleLegacy)
-        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-    return [scroller currentValueForThemeAttribute:@"scroller-width"];
-}
-
-/*!
-    Returns the CPScroller's overlay value.
-*/
-+ (float)scrollerOverlay
-{
-    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
+    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
 }
 
 /*!
@@ -152,87 +132,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return [self scrollerWidth];
 }
 
-
-#pragma mark -
-#pragma mark Initialization
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-        _style = CPScrollerStyleOverlay;
-        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-        [self _calculateIsVertical];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the scroller's style
-*/
-- (void)style
-{
-    return _style;
-}
-
-/*!
-    Set the scroller's control size
-    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
-*/
-- (void)setStyle:(id)aStyle
-{
-    if (_style != nil && _style === aStyle)
-        return;
-
-    _style = aStyle;
-
-    if (_style === CPScrollerStyleLegacy)
-    {
-        [self fadeIn];
-        [self setThemeState:CPThemeStateScrollViewLegacy];
-    }
-    else
-    {
-        _allowFadingOut = YES;
-        [self unsetThemeState:CPThemeStateScrollViewLegacy];
-    }
-
-    [self _adjustScrollerSize];
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
-/*!
-    Returns the scroller's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
 /*!
     Sets the scroller's size.
     @param aControlSize the scroller's size
@@ -248,6 +147,27 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsDisplay:YES];
 }
 
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+- (void)setKnobProportion:(float)aProportion
+{
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
 /*!
     Return's the knob's proportion
 */
@@ -256,50 +176,17 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _knobProportion;
 }
 
-/*!
-    Set the knob's proportion
-    @param aProportion the desired proportion
-*/
-- (void)setKnobProportion:(float)aProportion
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
-    if (!_IS_NUMERIC(aProportion))
-        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];
+    var themeState = _themeState;
 
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
 
-
-#pragma mark -
-#pragma mark Privates
-
-/*! @ignore */
-- (void)_adjustScrollerSize
-{
-    var frame = [self frame],
-        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
-
-    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-        frame.size.width = scrollerWidth;
-
-    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-        frame.size.height = scrollerWidth;
-
-    [self setFrame:frame];
-}
-
-/*! @ignore */
-- (void)_performFadeOut:(CPTimer)aTimer
-{
-    [self fadeOut];
-    _timerFadeOut = nil;
-}
-
-
-#pragma mark -
-#pragma mark Utilities
+// Calculating Layout
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -321,9 +208,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     // The ordering of these tests is important.  We check the knob and
     // page rects first since they may overlap with the arrows.
 
-    if (![self hasThemeState:CPThemeStateSelected])
-        return CPScrollerNoPart;
-
     if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
         return CPScrollerKnob;
 
@@ -446,35 +330,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _usableParts;
 }
 
-/*!
-    Display the scroller
-*/
-- (void)fadeIn
-{
-    if (_isMouseOver && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    [self setAlphaValue:1.0];
-}
-
-/*!
-    Start the fade out anination
-*/
-- (void)fadeOut
-{
-    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
-        return;
-
-    [_animationScroller startAnimation];
-}
-
-
-#pragma mark -
-#pragma mark  Drawing
-
+// Drawing the Parts
 /*!
     Draws the specified arrow and sets the highlight.
     @param anArrow the arrow to draw
@@ -526,8 +382,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length,
-        view;
+        count = PARTS_ARRANGEMENT.length;
 
     for (; index < count; ++index)
     {
@@ -603,8 +458,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 
-    if (type === CPLeftMouseDragged)
-        [self sendAction:[self action] to:[self target]];
+    [self sendAction:[self action] to:[self target]];
 }
 
 /*!
@@ -710,20 +564,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsLayout];
 }
 
-
-#pragma mark -
-#pragma mark Overrides
-
-- (id)currentValueForThemeAttribute:(CPString)anAttributeName
-{
-    var themeState = _themeState;
-
-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
-
-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     if (![self isEnabled])
@@ -742,53 +582,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     }
 }
 
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    [super mouseEntered:anEvent];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    if (![self isEnabled])
-        return;
-
-    _allowFadingOut = NO;
-    _isMouseOver = YES;
-
-    if ([self alphaValue] > 0 && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    [super mouseExited:anEvent];
-
-    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
-        return;
-
-    _allowFadingOut = YES;
-    _isMouseOver = NO;
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
-}
-
-
-#pragma mark -
-#pragma mark Delegates
-
-- (void)animationDidEnd:(CPAnimation)animation
-{
-    [self unsetThemeState:CPThemeStateSelected];
-}
-
 @end
 
-var CPScrollerControlSizeKey = @"CPScrollerControlSize",
-    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey = @"CPScrollerStyleKey";
+var CPScrollerControlSizeKey = "CPScrollerControlSize",
+    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
 
 @implementation CPScroller (CPCoding)
 
@@ -797,12 +594,10 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
     if (self = [super initWithCoder:aCoder])
     {
         _controlSize = CPRegularControlSize;
-
         if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
 
         _knobProportion = 1.0;
-
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
 
@@ -810,20 +605,20 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
         _hitPart = CPScrollerNoPart;
 
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-
-        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
         [self _calculateIsVertical];
 
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+        // Adjust the size of the scroller if the size from cib
+        // isn't equal to the scrollerWidth
+        var frame = [self frame],
+            scrollerWidth = [CPScroller scrollerWidth];
+
+        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+            frame.size.width = scrollerWidth;
+
+        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+            frame.size.height = scrollerWidth;
+
+        [self setFrame:frame];
     }
 
     return self;
@@ -835,7 +630,6 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
     [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
-    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }
 
 @end

AppKit/CPSearchField.j

@@ -72,7 +72,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 + (void)initialize
 {
-    if (self !== [CPSearchField class])
+    if (self != [CPSearchField class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
@@ -173,7 +173,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
         searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
 
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImageScaling:CPScaleToFit];
     [button setImage:searchButtonImage];
     [button setAutoresizingMask:CPViewMaxXMargin];
 }
@@ -215,7 +215,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     var button = [self cancelButton];
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImageScaling:CPScaleToFit];
     [button setImage:CPSearchFieldCancelImage];
     [button setAlternateImage:CPSearchFieldCancelPressedImage];
     [button setAutoresizingMask:CPViewMinXMargin];
@@ -501,12 +501,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
     if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
     {
         if (_searchMenuTemplate == nil)
-        {
-            if ([_searchButton target] && [_searchButton action])
-                [_searchButton mouseDown:anEvent];
-            else
-                [self _sendAction:self];
-        }
+            [self _sendAction:self];
         else
            [self _showMenu];
     }

AppKit/CPSegmentedControl.j

@@ -55,7 +55,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
                                        forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }
 
@@ -115,15 +115,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
+    // Make space for/remove space used by dividers.
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        frame = [self frame],
-        widthOfAllSegments = 0,
-        dividerExtraSpace = ([_segments count] - 1) * thickness;
+        delta = thickness * (dividersAfter - dividersBefore),
+        frame = [self frame];
 
-    for (var i = 0; i < [_segments count]; i++)
-        widthOfAllSegments += [_segments[i] width];
-
-    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
+    if (delta)
+        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
 
     [self tileWithChangedSegment:0];
 }
@@ -368,14 +366,11 @@ CPSegmentSwitchTrackingMomentary = 2;
     @param aSegment the segment to enable/disable
     @throws CPRangeException if \c aSegment is out of bounds
 */
-- (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
+- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    if ([_segments[aSegment] enabled] === shouldBeEnabled)
-        return;
+    [_segments[aSegment] setEnabled:isEnabled];
 
-    [_segments[aSegment] setEnabled:shouldBeEnabled];
-
-    if (shouldBeEnabled)
+    if (isEnabled)
         _themeStates[aSegment] &= ~CPThemeStateDisabled;
     else
         _themeStates[aSegment] |= CPThemeStateDisabled;

AppKit/CPShadow.j

@@ -61,7 +61,7 @@
         _blurRadius = aBlurRadius;
         _color = aColor;
 
-        _cssString = [_color cssString] + " " + ROUND(anOffset.width) + @"px " + ROUND(anOffset.height) + @"px " + ROUND(_blurRadius) + @"px";
+        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
     }
 
     return self;

AppKit/CPShadowView.j

@@ -47,6 +47,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 /*!
     @ingroup appkit
 */
+
 @implementation CPShadowView : CPView
 {
     CPShadowWeight  _weight;
@@ -54,38 +55,40 @@ var LIGHT_LEFT_INSET    = 3.0,
 
 + (void)initialize
 {
-    if (self !== [CPShadowView class])
+    if (self != [CPShadowView class])
         return;
 
     var bundle = [CPBundle bundleForClass:[self class]];
 
-    CPShadowViewLightBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewLightTopLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTop.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTopRight.png", 9.0, 9.0, bundle],
+    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
 
-        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
 
-        [@"CPShadowView/CPShadowViewLightBottomLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottom.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottomRight.png", 9.0, 9.0, bundle]
-    ]);
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
+        ]]];
 
-    CPShadowViewHeavyBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewHeavyTopLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTop.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTopRight.png", 17.0, 17.0, bundle],
+    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
 
-        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
 
-        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
-    ]);
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
+        ]]];
 }
 
 + (id)shadowViewEnclosingView:(CPView)aView
@@ -95,24 +98,20 @@ var LIGHT_LEFT_INSET    = 3.0,
 
 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[self alloc] initWithFrame:[aView frame]];
+    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
+    [shadowView setWeight:aWeight];
 
-    if (shadowView)
-    {
-        [shadowView setWeight:aWeight];
+    var size = [shadowView frame].size,
+        width = size.width - [shadowView leftInset] - [shadowView rightInset],
+        height = size.height - [shadowView topInset] - [shadowView bottomInset],
+        enclosingView = [aView superview];
 
-        var size = [shadowView frame].size,
-            width = size.width - [shadowView leftInset] - [shadowView rightInset],
-            height = size.height - [shadowView topInset] - [shadowView bottomInset],
-            enclosingView = [aView superview];
-
-        [shadowView setHitTests:[aView hitTests]];
-        [shadowView setAutoresizingMask:[aView autoresizingMask]];
-        [aView removeFromSuperview];
-        [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
-        [enclosingView addSubview:shadowView];
-    }
+    [shadowView setHitTests:[aView hitTests]];
+    [shadowView setAutoresizingMask:[aView autoresizingMask]];
+    [aView removeFromSuperview];
+    [shadowView addSubview:aView];
+    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+    [enclosingView addSubview:shadowView];
 
     return shadowView;
 }

AppKit/CPSliderColorPicker.j

@@ -60,7 +60,7 @@
 
 - (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
-    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
 }
 
 - (id)initView
@@ -70,156 +70,156 @@
     _contentView = [[CPView alloc] initWithFrame:aFrame];
     [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    _rgbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 10, 100, 20)];
-    [_rgbLabel setStringValue:"Red, Green, Blue"];
+    _rgbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 10, 100, 20)];
+    [_rgbLabel setStringValue: "Red, Green, Blue"];
     [_rgbLabel setTextColor:[CPColor blackColor]];
 
-    _redLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 37, 15, 20)];
-    [_redLabel setStringValue:"R"];
+    _redLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 37, 15, 20)];
+    [_redLabel setStringValue: "R"];
     [_redLabel setTextColor:[CPColor blackColor]];
 
-    _redSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 35, aFrame.size.width - 70, 20)];
-    [_redSlider setMaxValue:1.0];
-    [_redSlider setMinValue:0.0];
-    [_redSlider setTarget:self];
-    [_redSlider setAction:@selector(sliderChanged:)];
-    [_redSlider setAutoresizingMask:CPViewWidthSizable];
+    _redSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 35, aFrame.size.width - 70, 20)];
+    [_redSlider setMaxValue: 1.0];
+    [_redSlider setMinValue: 0.0];
+    [_redSlider setTarget: self];
+    [_redSlider setAction: @selector(sliderChanged:)];
+    [_redSlider setAutoresizingMask: CPViewWidthSizable];
 
     // red value input box
-    _redValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
-    [_redValue setAutoresizingMask:CPViewMinXMargin];
-    [_redValue setEditable:YES];
-    [_redValue setBezeled:YES];
-    [_redValue setDelegate:self];
-    [_contentView addSubview:_redValue];
+    _redValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
+    [_redValue setAutoresizingMask: CPViewMinXMargin];
+    [_redValue setEditable: YES];
+    [_redValue setBezeled: YES];
+    [_redValue setDelegate: self];
+    [_contentView addSubview: _redValue];
 
-    _greenLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 63, 15, 20)];
-    [_greenLabel setStringValue:"G"];
+    _greenLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 63, 15, 20)];
+    [_greenLabel setStringValue: "G"];
     [_greenLabel setTextColor:[CPColor blackColor]];
 
-    _greenSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 61, aFrame.size.width - 70, 20)];
-    [_greenSlider setMaxValue:1.0];
-    [_greenSlider setMinValue:0.0];
-    [_greenSlider setTarget:self];
-    [_greenSlider setAction:@selector(sliderChanged:)];
-    [_greenSlider setAutoresizingMask:CPViewWidthSizable];
+    _greenSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 61, aFrame.size.width - 70, 20)];
+    [_greenSlider setMaxValue: 1.0];
+    [_greenSlider setMinValue: 0.0];
+    [_greenSlider setTarget: self];
+    [_greenSlider setAction: @selector(sliderChanged:)];
+    [_greenSlider setAutoresizingMask: CPViewWidthSizable];
 
     // green value input box
-    _greenValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 56, 45, 28)];
-    [_greenValue setAutoresizingMask:CPViewMinXMargin];
-    [_greenValue setEditable:YES];
-    [_greenValue setBezeled:YES];
-    [_greenValue setDelegate:self];
-    [_contentView addSubview:_greenValue];
+    _greenValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 56, 45, 28)];
+    [_greenValue setAutoresizingMask: CPViewMinXMargin];
+    [_greenValue setEditable: YES];
+    [_greenValue setBezeled: YES];
+    [_greenValue setDelegate: self];
+    [_contentView addSubview: _greenValue];
 
-    _blueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 90, 15, 20)];
-    [_blueLabel setStringValue:"B"];
+    _blueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 90, 15, 20)];
+    [_blueLabel setStringValue: "B"];
     [_blueLabel setTextColor:[CPColor blackColor]];
 
-    _blueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 87, aFrame.size.width - 70, 20)];
-    [_blueSlider setMaxValue:1.0];
-    [_blueSlider setMinValue:0.0];
-    [_blueSlider setTarget:self];
-    [_blueSlider setAction:@selector(sliderChanged:)];
-    [_blueSlider setAutoresizingMask:CPViewWidthSizable];
+    _blueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 87, aFrame.size.width - 70, 20)];
+    [_blueSlider setMaxValue: 1.0];
+    [_blueSlider setMinValue: 0.0];
+    [_blueSlider setTarget: self];
+    [_blueSlider setAction: @selector(sliderChanged:)];
+    [_blueSlider setAutoresizingMask: CPViewWidthSizable];
 
     // blue value input box
-    _blueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 82, 45, 28)];
-    [_blueValue setAutoresizingMask:CPViewMinXMargin];
-    [_blueValue setEditable:YES];
-    [_blueValue setBezeled:YES];
-    [_blueValue setDelegate:self];
-    [_contentView addSubview:_blueValue];
+    _blueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 82, 45, 28)];
+    [_blueValue setAutoresizingMask: CPViewMinXMargin];
+    [_blueValue setEditable: YES];
+    [_blueValue setBezeled: YES];
+    [_blueValue setDelegate: self];
+    [_contentView addSubview: _blueValue];
 
-    _hsbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 120, 190, 20)];
-    [_hsbLabel setStringValue:"Hue, Saturation, Brightness"];
+    _hsbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
 
-    _hueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 145, 15, 20)];
-    [_hueLabel setStringValue:"H"];
+    _hueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 145, 15, 20)];
+    [_hueLabel setStringValue: "H"];
     [_hueLabel setTextColor:[CPColor blackColor]];
 
-    _hueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 143, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue:359.0];
-    [_hueSlider setMinValue:0.0];
-    [_hueSlider setTarget:self];
-    [_hueSlider setAction:@selector(sliderChanged:)];
-    [_hueSlider setAutoresizingMask:CPViewWidthSizable];
+    _hueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 143, aFrame.size.width - 70, 20)];
+    [_hueSlider setMaxValue: 359.0];
+    [_hueSlider setMinValue: 0.0];
+    [_hueSlider setTarget: self];
+    [_hueSlider setAction: @selector(sliderChanged:)];
+    [_hueSlider setAutoresizingMask: CPViewWidthSizable];
 
     // hue value input box
-    _hueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 138, 45, 28)];
-    [_hueValue setAutoresizingMask:CPViewMinXMargin];
-    [_hueValue setEditable:YES];
-    [_hueValue setBezeled:YES];
-    [_hueValue setDelegate:self];
-    [_contentView addSubview:_hueValue];
+    _hueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 138, 45, 28)];
+    [_hueValue setAutoresizingMask: CPViewMinXMargin];
+    [_hueValue setEditable: YES];
+    [_hueValue setBezeled: YES];
+    [_hueValue setDelegate: self];
+    [_contentView addSubview: _hueValue];
 
-    _saturationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 170, 15, 20)];
-    [_saturationLabel setStringValue:"S"];
+    _saturationLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 170, 15, 20)];
+    [_saturationLabel setStringValue: "S"];
     [_saturationLabel setTextColor:[CPColor blackColor]];
 
-    _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue:100.0];
-    [_saturationSlider setMinValue:0.0];
-    [_saturationSlider setTarget:self];
-    [_saturationSlider setAction:@selector(sliderChanged:)];
-    [_saturationSlider setAutoresizingMask:CPViewWidthSizable];
+    _saturationSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 168, aFrame.size.width - 70, 20)];
+    [_saturationSlider setMaxValue: 100.0];
+    [_saturationSlider setMinValue: 0.0];
+    [_saturationSlider setTarget: self];
+    [_saturationSlider setAction: @selector(sliderChanged:)];
+    [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
 
     // saturation value input box
-    _saturationValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 164, 45, 28)];
-    [_saturationValue setAutoresizingMask:CPViewMinXMargin];
-    [_saturationValue setEditable:YES];
-    [_saturationValue setBezeled:YES];
-    [_saturationValue setDelegate:self];
-    [_contentView addSubview:_saturationValue];
+    _saturationValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 164, 45, 28)];
+    [_saturationValue setAutoresizingMask: CPViewMinXMargin];
+    [_saturationValue setEditable: YES];
+    [_saturationValue setBezeled: YES];
+    [_saturationValue setDelegate: self];
+    [_contentView addSubview: _saturationValue];
 
-    _brightnessLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 196, 15, 20)];
-    [_brightnessLabel setStringValue:"B"];
+    _brightnessLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 196, 15, 20)];
+    [_brightnessLabel setStringValue: "B"];
     [_brightnessLabel setTextColor:[CPColor blackColor]];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue:100.0];
-    [_brightnessSlider setMinValue:0.0];
-    [_brightnessSlider setTarget:self];
-    [_brightnessSlider setAction:@selector(sliderChanged:)];
-    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 194, aFrame.size.width - 70, 20)];
+    [_brightnessSlider setMaxValue: 100.0];
+    [_brightnessSlider setMinValue: 0.0];
+    [_brightnessSlider setTarget: self];
+    [_brightnessSlider setAction: @selector(sliderChanged:)];
+    [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
 
     // brightness value input box
-    _brightnessValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 190, 45, 28)];
-    [_brightnessValue setAutoresizingMask:CPViewMinXMargin];
-    [_brightnessValue setEditable:YES];
-    [_brightnessValue setBezeled:YES];
-    [_brightnessValue setDelegate:self];
-    [_contentView addSubview:_brightnessValue];
+    _brightnessValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 190, 45, 28)];
+    [_brightnessValue setAutoresizingMask: CPViewMinXMargin];
+    [_brightnessValue setEditable: YES];
+    [_brightnessValue setBezeled: YES];
+    [_brightnessValue setDelegate: self];
+    [_contentView addSubview: _brightnessValue];
 
-    _hexLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 230, 30, 20)];
-    [_hexLabel setStringValue:"Hex"];
+    _hexLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 230, 30, 20)];
+    [_hexLabel setStringValue: "Hex"];
     [_hexLabel setTextColor:[CPColor blackColor]];
 
     //hex input box
-    _hexValue = [[CPTextField alloc] initWithFrame:CGRectMake(32, 225, 80, 28)];
-    [_hexValue setEditable:YES];
-    [_hexValue setBezeled:YES];
-    [_hexValue setDelegate:self];
-    [_contentView addSubview:_hexValue];
+    _hexValue = [[CPTextField alloc] initWithFrame: CGRectMake(32, 225, 80, 28)];
+    [_hexValue setEditable: YES];
+    [_hexValue setBezeled: YES];
+    [_hexValue setDelegate: self];
+    [_contentView addSubview: _hexValue];
 
-    [_contentView addSubview:_rgbLabel];
-    [_contentView addSubview:_redLabel];
-    [_contentView addSubview:_greenLabel];
-    [_contentView addSubview:_blueLabel];
-    [_contentView addSubview:_redSlider];
-    [_contentView addSubview:_greenSlider];
-    [_contentView addSubview:_blueSlider];
+    [_contentView addSubview: _rgbLabel];
+    [_contentView addSubview: _redLabel];
+    [_contentView addSubview: _greenLabel];
+    [_contentView addSubview: _blueLabel];
+    [_contentView addSubview: _redSlider];
+    [_contentView addSubview: _greenSlider];
+    [_contentView addSubview: _blueSlider];
 
-    [_contentView addSubview:_hsbLabel];
-    [_contentView addSubview:_hueLabel];
-    [_contentView addSubview:_saturationLabel];
-    [_contentView addSubview:_brightnessLabel];
-    [_contentView addSubview:_hueSlider];
-    [_contentView addSubview:_saturationSlider];
-    [_contentView addSubview:_brightnessSlider];
+    [_contentView addSubview: _hsbLabel];
+    [_contentView addSubview: _hueLabel];
+    [_contentView addSubview: _saturationLabel];
+    [_contentView addSubview: _brightnessLabel];
+    [_contentView addSubview: _hueSlider];
+    [_contentView addSubview: _saturationSlider];
+    [_contentView addSubview: _brightnessSlider];
 
-    [_contentView addSubview:_hexLabel];
+    [_contentView addSubview: _hexLabel];
 }
 
 - (CPView)provideNewView:(BOOL)initialRequest
@@ -250,35 +250,35 @@
     {
         case    _hueSlider:
         case    _saturationSlider:
-        case    _brightnessSlider:      newColor = [CPColor colorWithHue:[_hueSlider floatValue]
-                                                              saturation:[_saturationSlider floatValue]
-                                                              brightness:[_brightnessSlider floatValue]
-                                                                   alpha:alpha];
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
+                                                              saturation: [_saturationSlider floatValue]
+                                                              brightness: [_brightnessSlider floatValue]
+                                                                   alpha: alpha];
 
-                                        [self updateRGBSliders:newColor];
+                                        [self updateRGBSliders: newColor];
                                         break;
 
         case    _redSlider:
         case    _greenSlider:
-        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed:[_redSlider floatValue]
-                                                                             green:[_greenSlider floatValue]
-                                                                              blue:[_blueSlider floatValue]
-                                                                             alpha:alpha];
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
+                                                                             green: [_greenSlider floatValue]
+                                                                              blue: [_blueSlider floatValue]
+                                                                             alpha: alpha];
 
-                                        [self updateHSBSliders:newColor];
+                                        [self updateHSBSliders: newColor];
                                         break;
     }
 
     [self updateLabels];
-    [self updateHex:newColor];
-    [colorPanel setColor:newColor];
+    [self updateHex: newColor];
+    [colorPanel setColor: newColor];
 }
 
 - (void)setColor:(CPColor)aColor
 {
-    [self updateRGBSliders:aColor];
-    [self updateHSBSliders:aColor];
-    [self updateHex:aColor];
+    [self updateRGBSliders: aColor];
+    [self updateHSBSliders: aColor];
+    [self updateHex: aColor];
     [self updateLabels];
 }
 
@@ -307,13 +307,13 @@
 
 - (void)updateLabels
 {
-    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
-    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
-    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];
+    [_hueValue setStringValue: ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue: ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue: ROUND([_brightnessSlider floatValue])];
 
-    [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
-    [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
-    [_blueValue setStringValue:ROUND([_blueSlider floatValue] * 255)];
+    [_redValue setStringValue: ROUND([_redSlider floatValue] * 255)];
+    [_greenValue setStringValue: ROUND([_greenSlider floatValue] * 255)];
+    [_blueValue setStringValue: ROUND([_blueSlider floatValue] * 255)];
 }
 
 - (CPImage)provideNewButtonImage
@@ -333,12 +333,12 @@
 
     if (field === _hexValue)
     {
-        var newColor = [CPColor colorWithHexString:value];
+        var newColor = [CPColor colorWithHexString: value];
 
         if (newColor)
         {
-            [self setColor:newColor];
-            [[self colorPanel] setColor:newColor];
+            [self setColor: newColor];
+            [[self colorPanel] setColor: newColor];
         }
     }
     else
@@ -346,27 +346,27 @@
         switch (field)
         {
             case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_redSlider];
+                                   [self sliderChanged: _redSlider];
                                    break;
 
             case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_greenSlider];
+                                   [self sliderChanged: _greenSlider];
                                    break;
 
             case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_blueSlider];
+                                   [self sliderChanged: _blueSlider];
                                    break;
 
             case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
-                                   [self sliderChanged:_hueSlider];
+                                   [self sliderChanged: _hueSlider];
                                    break;
 
             case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged:_saturationSlider];
+                                   [self sliderChanged: _saturationSlider];
                                    break;
 
             case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged:_brightnessSlider];
+                                   [self sliderChanged: _brightnessSlider];
                                    break;
         }
     }

AppKit/CPSound.j

@@ -45,7 +45,6 @@ CPSoundPlayBackStatePause   = 2;
     CPString            _name       @accessors(property=name);
     id                  _delegate   @accessors(property=delegate);
 
-    BOOL                _playRequestBeforeLoad;
     HTMLAudioElement    _audioTag;
     int                 _loadStatus;
     int                 _playBackStatus;
@@ -62,7 +61,6 @@ CPSoundPlayBackStatePause   = 2;
         _loops = NO;
         _audioTag = document.createElement("audio");
         _audioTag.preload = YES;
-        _playRequestBeforeLoad = NO;
 
         _audioTag.addEventListener("canplay", function()
         {
@@ -140,12 +138,6 @@ CPSoundPlayBackStatePause   = 2;
 - (void)_soundDidload
 {
     _loadStatus = CPSoundLoadStateCanBePlayed;
-
-    if (_playRequestBeforeLoad)
-    {
-        _playRequestBeforeLoad = NO;
-        [self play];
-    }
 }
 
 /*! @ignore
@@ -175,12 +167,6 @@ CPSoundPlayBackStatePause   = 2;
 */
 - (BOOL)play
 {
-    if (_loadStatus === CPSoundLoadStateLoading)
-    {
-        _playRequestBeforeLoad = YES;
-        return YES;
-    }
-
     if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
         || (_playBackStatus === CPSoundPlayBackStatePlay))
         return NO;

AppKit/CPSplitView.j

@@ -20,43 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
 @import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
 
-#define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
-    if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
-    { \
-        [self _postNotificationWillResize]; \
-        _suppressResizeNotificationsMask |= DidPostWillResizeNotification; \
-    }
-
-#define SPLIT_VIEW_MAYBE_POST_DID_RESIZE() \
-    if ((_suppressResizeNotificationsMask & ShouldSuppressResizeNotifications) !== 0) \
-        _suppressResizeNotificationsMask |= DidSuppressResizeNotification; \
-    else \
-        [self _postNotificationDidResize];
-
-#define SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION() \
-    ((_suppressResizeNotificationsMask & DidSuppressResizeNotification) !== 0)
-
-#define SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(shouldSuppress) \
-    if (shouldSuppress) \
-        _suppressResizeNotificationsMask |= ShouldSuppressResizeNotifications; \
-    else \
-        _suppressResizeNotificationsMask = 0;
 
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
 
 var CPSplitViewHorizontalImage = nil,
-    CPSplitViewVerticalImage = nil,
-
-    ShouldSuppressResizeNotifications   = 1,
-    DidPostWillResizeNotification       = 1 << 1,
-    DidSuppressResizeNotification       = 1 << 2;
+    CPSplitViewVerticalImage = nil;
 
 /*!
     @ingroup appkit
@@ -72,29 +45,24 @@ var CPSplitViewHorizontalImage = nil,
 
 @implementation CPSplitView : CPView
 {
-    id              _delegate;
-    BOOL            _isVertical;
-    BOOL            _isPaneSplitter;
+    id          _delegate;
+    BOOL        _isVertical;
+    BOOL        _isPaneSplitter;
 
-    int             _currentDivider;
-    float           _initialOffset;
-    CPDictionary    _preCollapsePositions;
+    int         _currentDivider;
+    float       _initialOffset;
+    float       _preCollapsePosition;
 
-    CPString        _originComponent;
-    CPString        _sizeComponent;
+    CPString    _originComponent;
+    CPString    _sizeComponent;
 
-    CPArray         _DOMDividerElements;
-    CPString        _dividerImagePath;
-    int             _drawingDivider;
+    CPArray     _DOMDividerElements;
+    CPString    _dividerImagePath;
+    int         _drawingDivider;
 
-    CPString        _autosaveName;
-    BOOL            _shouldAutosave;
-    CGSize          _shouldRestoreFromAutosaveUnlessFrameSize;
+    BOOL        _needsResizeSubviews;
 
-    BOOL            _needsResizeSubviews;
-    int             _suppressResizeNotificationsMask;
-
-    CPArray         _buttonBars;
+    CPArray     _buttonBars;
 }
 
 + (CPString)defaultThemeClass
@@ -113,28 +81,23 @@ var CPSplitViewHorizontalImage = nil,
 */
 + (void)initialize
 {
-    if (self !== [CPSplitView class])
+    if (self != [CPSplitView class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
-
-    CPSplitViewHorizontalImage = CPImageInBundle("CPSplitView/CPSplitViewHorizontal.png", CGSizeMake(5.0, 10.0), bundle);
-    CPSplitViewVerticalImage = CPImageInBundle("CPSplitView/CPSplitViewVertical.png", CGSizeMake(10.0, 5.0), bundle);
+    CPSplitViewHorizontalImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewHorizontal.png"] size:CPSizeMake(5.0, 10.0)];
+    CPSplitViewVerticalImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewVertical.png"] size:CPSizeMake(10.0, 5.0)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _suppressResizeNotificationsMask = 0;
-        _preCollapsePositions = [CPMutableDictionary new];
         _currentDivider = CPNotFound;
 
         _DOMDividerElements = [];
         _buttonBars = [];
 
-        _shouldAutosave = YES;
-
         [self _setVertical:YES];
     }
 
@@ -179,17 +142,14 @@ var CPSplitViewHorizontalImage = nil,
         count = _subviews.length;
 
     if ([self isVertical])
-    {
         for (; index < count; ++index)
             [_subviews[index] setFrame:CGRectMake(ROUND((eachSize + dividerThickness) * index), 0, eachSize, frame.size.height)];
-    }
     else
-    {
         for (; index < count; ++index)
             [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
-    }
 
     [self setNeedsDisplay:YES];
+
     [self _postNotificationDidResize];
 
 }
@@ -265,6 +225,7 @@ var CPSplitViewHorizontalImage = nil,
         rect = CGRectMakeZero();
 
     rect.size = [self frame].size;
+
     rect.size[_sizeComponent] = [self dividerThickness];
     rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
 
@@ -373,33 +334,28 @@ var CPSplitViewHorizontalImage = nil,
 
     _needsResizeSubviews = NO;
 
-    [self resizeSubviewsWithOldSize:[self _calculateSize]];
-}
-
-- (CGSize)_calculateSize
-{
     var subviews = [self subviews],
         count = subviews.length,
-        size = CGSizeMakeZero();
+        oldSize = CGSizeMakeZero();
 
     if ([self isVertical])
     {
-        size.width += [self dividerThickness] * (count - 1);
-        size.height = CGRectGetHeight([self frame]);
+        oldSize.width += [self dividerThickness] * (count - 1);
+        oldSize.height = CGRectGetHeight([self frame]);
     }
     else
     {
-        size.width = CGRectGetWidth([self frame]);
-        size.height += [self dividerThickness] * (count - 1);
+        oldSize.width = CGRectGetWidth([self frame]);
+        oldSize.height += [self dividerThickness] * (count - 1);
     }
 
     while (count--)
-        size[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
+        oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
 
-    return size;
+    [self resizeSubviewsWithOldSize:oldSize];
 }
 
-- (BOOL)cursorAtPoint:(CGPoint)aPoint hitDividerAtIndex:(int)anIndex
+- (BOOL)cursorAtPoint:(CPPoint)aPoint hitDividerAtIndex:(int)anIndex
 {
     var frame = [_subviews[anIndex] frame],
         startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
@@ -452,14 +408,11 @@ var CPSplitViewHorizontalImage = nil,
 
     if (type == CPLeftMouseUp)
     {
-        // We disabled autosaving during tracking.
-        _shouldAutosave = YES;
-
         if (_currentDivider != CPNotFound)
         {
             _currentDivider = CPNotFound;
-            [self _autosave];
             [self _updateResizeCursor:anEvent];
+            [self _postNotificationDidResize];
         }
 
         return;
@@ -467,11 +420,10 @@ var CPSplitViewHorizontalImage = nil,
 
     if (type == CPLeftMouseDown)
     {
-        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-            count = [_subviews count] - 1;
+        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
         _currentDivider = CPNotFound;
-
+        var count = [_subviews count] - 1;
         for (var i = 0; i < count; i++)
         {
             var frame = [_subviews[i] frame],
@@ -484,20 +436,19 @@ var CPSplitViewHorizontalImage = nil,
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
                 {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
-                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
-                        preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;
+                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
                     if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i]])
-                            [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:minPosition ofDividerAtIndex:i];
                     }
                     else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i + 1]])
-                            [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:maxPosition ofDividerAtIndex:i];
                     }
@@ -507,8 +458,6 @@ var CPSplitViewHorizontalImage = nil,
                     _currentDivider = i;
                     _initialOffset = startPosition - point[_originComponent];
 
-                    // Don't autosave during a resize. We'll wait until it's done.
-                    _shouldAutosave = NO;
                     [self _postNotificationWillResize];
                 }
             }
@@ -577,37 +526,19 @@ var CPSplitViewHorizontalImage = nil,
         // If we are currently tracking, keep the resize cursor active even outside of hit areas.
         if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
         {
-            var frameA = [_subviews[i] frame],
-                sizeA = frameA.size[_sizeComponent],
-                startPosition = frameA.origin[_originComponent] + sizeA,
-                frameB = [_subviews[i + 1] frame],
-                sizeB = frameB.size[_sizeComponent],
+            var frame = [_subviews[i] frame],
+                size = frame.size[_sizeComponent],
+                startPosition = frame.origin[_originComponent] + size,
                 canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition,
                 canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition,
                 cursor = [CPCursor arrowCursor];
 
-            if (sizeA === 0)
+            if (size === 0)
                 canGrow = YES; // Subview is collapsed.
             else if (!canShrink &&
-                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                     [_delegate splitView:self canCollapseSubview:_subviews[i]])
-            {
+                [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                [_delegate splitView:self canCollapseSubview:_subviews[i]])
                 canShrink = YES; // Subview is collapsible.
-            }
-
-            if (sizeB === 0)
-            {
-                // Right/lower subview is collapsed.
-                canGrow = NO;
-                // It's safe to assume it can always be uncollapsed.
-                canShrink = YES;
-            }
-            else if (!canGrow &&
-                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                     [_delegate splitView:self canCollapseSubview:_subviews[i + 1]])
-            {
-                canGrow = YES; // Right/lower subview is collapsible.
-            }
 
             if (_isVertical && canShrink && canGrow)
                 cursor = [CPCursor resizeLeftRightCursor];
@@ -666,15 +597,7 @@ var CPSplitViewHorizontalImage = nil,
 {
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-    {
-        var proposedPosition = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
-
-        // Silently ignore bad positions which could result from odd delegate responses. We don't want these
-        // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
-        // its subviews.
-        if (_IS_NUMERIC(proposedPosition))
-            position = proposedPosition;
-    }
+        position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
 
     var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
@@ -682,37 +605,19 @@ var CPSplitViewHorizontalImage = nil,
         actualMin = proposedMin;
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-
-        if (_IS_NUMERIC(proposedActualMin))
-            actualMin = proposedActualMin;
-    }
+        actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
-
-        if (_IS_NUMERIC(proposedActualMax))
-            actualMax = proposedActualMax;
-    }
+        actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
     var viewA = _subviews[dividerIndex],
-        viewB = _subviews[dividerIndex + 1],
         realPosition = MAX(MIN(position, actualMax), actualMin);
 
-    // Is this position past the halfway point to collapse?
-    if (position < proposedMin + (actualMin - proposedMin) / 2)
+    if (position <  proposedMin + (actualMin - proposedMin) / 2)
         if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
             if ([_delegate splitView:self canCollapseSubview:viewA])
                 realPosition = proposedMin;
 
-    // We can also collapse to the right.
-    if (position > proposedMax - (proposedMax - actualMax) / 2)
-        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
-            if ([_delegate splitView:self canCollapseSubview:viewB])
-                realPosition = proposedMax;
-
     return realPosition;
 }
 
@@ -723,73 +628,39 @@ var CPSplitViewHorizontalImage = nil,
 */
 - (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
-    // Any manual changes to the divider position should override anything we are restoring from
-    // autosave.
-    _shouldRestoreFromAutosaveUnlessFrameSize = nil;
-
-    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(YES);
     [self _adjustSubviewsWithCalculatedSize];
 
-    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex],
-        viewA = _subviews[dividerIndex],
+    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
+
+    var viewA = _subviews[dividerIndex],
         frameA = [viewA frame],
         viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame],
-        preCollapsePosition = 0,
-        preSize = frameA.size[_sizeComponent];
+        frameB = [viewB frame];
 
+    _preCollapsePosition = 0;
+
+    var preSize = frameA.size[_sizeComponent];
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
-
     if (preSize !== 0 && frameA.size[_sizeComponent] === 0)
-        preCollapsePosition = preSize;
-
-    if (preSize !== frameA.size[_sizeComponent])
-    {
-        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
-        [_subviews[dividerIndex] setFrame:frameA];
-        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
-    }
+        _preCollapsePosition = preSize;
+    [_subviews[dividerIndex] setFrame:frameA];
 
     preSize = frameB.size[_sizeComponent];
-
-    var preOrigin = frameB.origin[_originComponent];
     frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
-
     if (preSize !== 0 && frameB.size[_sizeComponent] === 0)
-        preCollapsePosition = frameB.origin[_originComponent];
-
+        _preCollapsePosition = preSize;
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
-
-    if (preSize !== frameB.size[_sizeComponent] || preOrigin !== frameB.origin[_originComponent])
-    {
-        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
-        [_subviews[dividerIndex + 1] setFrame:frameB];
-        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
-    }
-
-    if (preCollapsePosition)
-        [_preCollapsePositions setObject:preCollapsePosition forKey:"" + dividerIndex];
+    [_subviews[dividerIndex + 1] setFrame:frameB];
 
     [self setNeedsDisplay:YES];
-
-    if (SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION())
-        [self _postNotificationDidResize];
-
-    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(NO);
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
-    if (_shouldRestoreFromAutosaveUnlessFrameSize)
-        _shouldAutosave = NO;
-    else
-        [self _adjustSubviewsWithCalculatedSize];
+    [self _adjustSubviewsWithCalculatedSize];
 
     [super setFrameSize:aSize];
 
-    if (_shouldRestoreFromAutosaveUnlessFrameSize)
-        _shouldAutosave = YES;
-
     [self setNeedsDisplay:YES];
 }
 
@@ -801,104 +672,67 @@ var CPSplitViewHorizontalImage = nil,
         return;
     }
 
-    [self adjustSubviews];
-}
-
-- (void)adjustSubviews
-{
-    var count = [_subviews count];
-
-    if (!count)
-        return;
-
-    SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
     [self _postNotificationWillResize];
 
     var index = 0,
+        count = [_subviews count],
         bounds = [self bounds],
-        boundsSize = bounds.size[_sizeComponent],
-        oldSize = [self _calculateSize],
         dividerThickness = [self dividerThickness],
         totalDividers = count - 1,
-        oldFlexibleSpace = 0,
+        totalSizableSpace = 0,
+        nonSizableSpace = 0,
+        lastSizableIndex = -1,
         totalSizablePanes = 0,
-        isSizableMap = {},
-        viewSizes = [],
-        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];
+        isVertical = [self isVertical];
 
-    // What we want to do is to preserve non resizable sizes first, and then to preserve the ratio of size to available
-    // non fixed space for every other subview. E.g. assume fixed space was 20 pixels initially, view 1 was 20 and
-    // view 2 was 30 pixels, for a total of 70 pixels. Then the new total size becomes 140 pixels. Now we want the fixed
-    // space to still be 20 pixels, view 1 to be 48 pixels and view 2 to be 72 pixels. This way the relative size of
-    // view 1 to view 2 remains the same - view 1 was 66% of view 2 initially and after the resize view 1 is still
-    // 66% of view 2's size.
-    //
-    // For this calculation, we can consider the dividers themselves to also be fixed size areas - they should remain
-    // the same size before and after.
-
-    // How much flexible size do we have in pre-resize pixels?
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
-            isSizable = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
-            size = [view frame].size[_sizeComponent];
-
-        isSizableMap[index] = isSizable;
-        viewSizes.push(size);
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
         if (isSizable)
         {
-            oldFlexibleSpace += size;
+            totalSizableSpace += [view frame].size[_sizeComponent];
+            lastSizableIndex = index;
             totalSizablePanes++;
         }
     }
 
-    // nonSizableSpace is the number of fixed pixels in pre-resize terms and the desired number post-resize.
-    var nonSizableSpace = oldSize[_sizeComponent] - oldFlexibleSpace,
-        newFlexibleSpace = boundsSize - nonSizableSpace,
-        remainingFixedPixelsToRemove = 0;
+    if (totalSizablePanes === count)
+        totalSizableSpace = 0;
 
-    if (newFlexibleSpace < 0)
-    {
-        remainingFixedPixelsToRemove = -newFlexibleSpace;
-        newFlexibleSpace = 0;
-    }
-
-    var remainingFixedPanes = count - totalSizablePanes;
+    var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
+        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
+        oldDimension = (oldSize[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace),
+        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace) / oldDimension;
 
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
             viewFrame = CGRectMakeCopy(bounds),
-            isSizable = isSizableMap[index],
-            targetSize = 0;
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
-        // The last area must take up exactly the remaining space, fixed or not.
         if (index + 1 === count)
-            targetSize = boundsSize - viewFrame.origin[_originComponent];
-        // Try to keep fixed size areas the same size.
-        else if (!isSizable)
-        {
-            var removedFixedPixels = MIN(remainingFixedPixelsToRemove / remainingFixedPanes, viewSizes[index]);
-            targetSize = viewSizes[index] - removedFixedPixels;
-            remainingFixedPixelsToRemove -= removedFixedPixels;
-            remainingFixedPanes--;
-        }
-        // (new size / flexible size available) == (old size / old flexible size available)
-        else if (oldFlexibleSpace > 0)
-            targetSize = newFlexibleSpace * viewSizes[index] / oldFlexibleSpace;
-        // oldFlexibleSpace <= 0 so all flexible areas were crushed. When we get space, allocate it evenly.
-        // totalSizablePanes cannot be 0 since isSizable.
-        else
-            targetSize = newFlexibleSpace / totalSizablePanes;
+            viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
+
+        else if (totalSizableSpace && isSizable && lastSizableIndex === index)
+            viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
+
+        else if (isSizable || !totalSizableSpace)
+        {
+            viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
+            remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
+        }
+
+        else if (totalSizableSpace && !isSizable)
+            viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
+
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
 
-        targetSize = MAX(0, ROUND(targetSize));
-        viewFrame.size[_sizeComponent] = targetSize;
         [view setFrame:viewFrame];
-        bounds.origin[_originComponent] += targetSize + dividerThickness;
     }
 
-    SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
+    [self _postNotificationDidResize];
 }
 
 /*!
@@ -915,11 +749,6 @@ Notifies the delegate when the subviews will be resized.
 - (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
 @endcode
 
-Allows the delegate to specify which of the CPSplitView's subviews should adjust if the window is resized.
-@code
-- (BOOL)splitView:(CPSplitView)aSplitView shouldAdjustSizeOfSubview:(CPView)aSubView
-@endcode
-
 Lets the delegate specify a different rect for which the user can drag the splitView divider.
 @code
 - (CGRect)splitView:(CPSplitView)aSplitView effectiveRect:(CGRect)aRect forDrawnRect:(CGRect)aDrawnRect ofDividerAtIndex:(int)aDividerIndex;
@@ -1002,7 +831,6 @@ The sum of the views and the sum of the dividers should be equal to the size of
     @param CPButtonBar - The supplied button bar.
     @param unsigned int - The divider index the button bar will be assigned to.
 */
-// FIXME Should be renamed to setButtonBar:ofDividerAtIndex:.
 - (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
 {
     if (!aButtonBar)
@@ -1034,161 +862,12 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 - (void)_postNotificationWillResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
-                                                        object:self
-                                                      userInfo:userInfo];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
 }
 
 - (void)_postNotificationDidResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
-                                                        object:self
-                                                      userInfo:userInfo];
-
-
-    // TODO Cocoa always autosaves on "viewDidEndLiveResize". If Cappuccino adds support for this we
-    // should do the same.
-    [self _autosave];
-}
-
-/*!
-    Set the name under which the split view divider positions is automatically saved to CPUserDefaults.
-
-    @param autosaveName the name to save under or nil to not save
-*/
-- (void)setAutosaveName:(CPString)autosaveName
-{
-    if (_autosaveName == autosaveName)
-        return;
-
-    _autosaveName = autosaveName;
-}
-
-/*!
-    Get the name under which the split view divider position is automatically saved to CPUserDefaults.
-
-    @return the name to save under or nil if no autosave is active
-*/
-- (CPString)autosaveName
-{
-    return _autosaveName;
-}
-
-/*!
-    @ignore
-*/
-- (void)_autosave
-{
-    if (_shouldRestoreFromAutosaveUnlessFrameSize || !_shouldAutosave || !_autosaveName)
-        return;
-
-    var userDefaults = [CPUserDefaults standardUserDefaults],
-        autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
-        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
-        count = [_subviews count],
-        positions = [CPMutableArray new],
-        preCollapseArray = [CPMutableArray new];
-
-    for (var i = 0; i < count; i++)
-    {
-        var frame = [_subviews[i] frame];
-        [positions addObject:CPStringFromRect(frame)];
-        [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
-    }
-
-    [userDefaults setObject:positions forKey:autosaveName];
-    [userDefaults setObject:preCollapseArray forKey:autosavePrecollapseName];
-}
-
-/*!
-    This is called sometime later after a split view has been restored from a Cib.
-    See notes in initWithCoder.
-
-    @ignore
-*/
-- (void)_restoreFromAutosaveIfNeeded
-{
-    if (_shouldRestoreFromAutosaveUnlessFrameSize && !_CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
-    {
-        [self _restoreFromAutosave];
-    }
-
-    _shouldRestoreFromAutosaveUnlessFrameSize = nil;
-}
-
-/*!
-    @ignore
-*/
-- (void)_restoreFromAutosave
-{
-    if (!_autosaveName)
-        return;
-
-    var autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
-        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
-        userDefaults = [CPUserDefaults standardUserDefaults],
-        frames = [userDefaults objectForKey:autosaveName],
-        preCollapseArray = [userDefaults objectForKey:autosavePrecollapseName];
-
-    if (frames)
-    {
-        var dividerThickness = [self dividerThickness],
-            position = 0;
-
-        _shouldAutosave = NO;
-
-        for (var i = 0, count = [frames count] - 1; i < count; i++)
-        {
-            var frame = CPRectFromString(frames[i]);
-            position += frame.size[_sizeComponent];
-
-            [self setPosition:position ofDividerAtIndex:i];
-
-            position += dividerThickness;
-        }
-
-        _shouldAutosave = YES;
-    }
-
-    if (preCollapseArray)
-    {
-        _preCollapsePositions = [CPMutableDictionary new];
-
-        for (var i = 0, count = [preCollapseArray count]; i < count; i++)
-            [_preCollapsePositions setObject:preCollapseArray[i] forKey:i + ""];
-    }
-}
-
-/*!
-    @ignore
-*/
-- (CPString)_framesKeyForAutosaveName:(CPString)theAutosaveName
-{
-    if (!theAutosaveName)
-        return nil;
-
-    return @"CPSplitView Subview Frames " + theAutosaveName;
-}
-
-/*!
-    @ignore
-*/
-- (CPString)_precollapseKeyForAutosaveName:(CPString)theAutosaveName
-{
-    if (!theAutosaveName)
-        return nil;
-
-    return @"CPSplitView Subview Precollapse Positions " + theAutosaveName;
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self];
 }
 
 @end
@@ -1196,8 +875,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
     CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
-    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey",
-    CPSplitViewAutosaveNameKey      = "CPSplitViewAutosaveNameKey";
+    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
 
 @implementation CPSplitView (CPCoding)
 
@@ -1207,43 +885,11 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-    // We need to restore this property before calling super's initWithCoder:.
-    _autosaveName = [aCoder decodeObjectForKey:CPSplitViewAutosaveNameKey];
-
-    /*
-
-    It is common for the main window of a Cappuccino app window to be resized to match the browser
-    window size at the end of the UI being loaded from a cib. But at decoding time (now) whatever
-    window size was originally saved will be in place, so if we try to restore the autosaved divider
-    positions now they might be constrained to the wrong positions due to the difference in frame size,
-    and in addition they might move later when the window is resized.
-
-    The workaround is to restore the position once now (so it's approximately correct during loading),
-    and then once more in the next runloop cycle when any `setFullPlatformWindow` calls are done.
-
-    (However if the frame size doesn't change before the next cycle, we should not restore the position
-    again because that would overwrite any changes the app developer might have made in user code.)
-
-    The other consideration is that any parent split views need to be restored before any child
-    subviews, otherwise the parent restore will also change the positioning of the child.
-
-    */
-    if (_autosaveName)
-    {
-        // Schedule /before/ [super initWithCoder:]. This way this instance's _restoreFromAutosaveIfNeeded
-        // will happen before that of any subviews loaded by [super initWithCoder:].
-        [[CPRunLoop currentRunLoop] performSelector:@selector(_restoreFromAutosaveIfNeeded) target:self argument:nil order:0 modes:[CPDefaultRunLoopMode]];
-    }
-
     self = [super initWithCoder:aCoder];
 
     if (self)
     {
-        _suppressResizeNotificationsMask = 0;
-        _preCollapsePositions = [CPMutableDictionary new];
-
         _currentDivider = CPNotFound;
-        _shouldAutosave = YES;
 
         _DOMDividerElements = [];
 
@@ -1253,14 +899,6 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
         _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
         [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
-
-        if (_autosaveName)
-        {
-            [self _restoreFromAutosave];
-            // Remember the frame size we had at this point so that we can restore again if it changes
-            // before the next runloop cycle. See above notes.
-            _shouldRestoreFromAutosaveUnlessFrameSize = [self frameSize];
-        }
     }
 
     return self;
@@ -1281,8 +919,6 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
-
-    [aCoder encodeObject:_autosaveName forKey:CPSplitViewAutosaveNameKey];
 }
 
 @end

AppKit/CPStepper.j

@@ -25,16 +25,15 @@
 @import <AppKit/CPTextField.j>
 
 
+var CPStepperButtonsSize = CPSizeMake(19, 13);
 
-/*!
-    CPStepper is an implementation of Cocoa NSStepper.
+/*! CPStepper is an  implementation of Cocoa NSStepper.
 
-    This control displays a two part button that can be used to increase or decrease a value with a given interval.
+    This control display a two part button that can be used to increase or decrease a value with a given interval.
 */
 @implementation CPStepper: CPControl
 {
     BOOL        _valueWraps     @accessors(property=valueWraps);
-    BOOL        _autorepeat     @accessors(getter=autorepeat);
     int         _increment      @accessors(property=increment);
     int         _maxValue       @accessors(property=maxValue);
     int         _minValue       @accessors(property=minValue);
@@ -46,8 +45,7 @@
 #pragma mark -
 #pragma mark Initialization
 
-/*!
-    Initializes a CPStepper with given values.
+/*! Initializes a CPStepper with given values
     @param aValue the initial value of the CPStepper
     @param minValue the minimal acceptable value of the stepper
     @param maxValue the maximal acceptable value of the stepper
@@ -55,7 +53,7 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    var stepper = [[CPStepper alloc] initWithFrame:CPRectMake(0, 0, 19, 25)];
     [stepper setDoubleValue:aValue];
     [stepper setMinValue:aMinValue];
     [stepper setMaxValue:aMaxValue];
@@ -63,12 +61,10 @@
     return stepper;
 }
 
-/*!
-    Initializes a CPStepper with default values:
+/*! Initializes a CPStepper with default values:
         - minValue = 0.0
         - maxValue = 59.0
         - value = 0.0
-
     @return Initialized CPStepper
 */
 + (CPStepper)stepper
@@ -76,24 +72,7 @@
     return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }
 
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
-        return [_CPStepperValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (id)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"doubleValue";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-/*!
-    Initializes a CPStepper.
+/*! Initializes the CPStepper
     @param aFrame the frame of the control
     @return initialized CPStepper
 */
@@ -105,43 +84,33 @@
         _minValue       = 0.0;
         _increment      = 1.0;
         _valueWraps     = YES;
-        _autorepeat     = YES;
 
         [self setDoubleValue:0.0];
-        [self _init];
+
+        _buttonUp = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, 0, CPStepperButtonsSize.width, CPStepperButtonsSize.height)];
+        [_buttonUp setContinuous:YES];
+        [_buttonUp setTarget:self];
+        [_buttonUp setAction:@selector(_buttonDidClick:)];
+        [_buttonUp setAutoresizingMask:CPViewNotSizable];
+        [self addSubview:_buttonUp];
+
+        _buttonDown = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, CPStepperButtonsSize.height, CPStepperButtonsSize.width, CPStepperButtonsSize.height - 1)];
+        [_buttonDown setContinuous:YES];
+        [_buttonDown setTarget:self];
+        [_buttonDown setAction:@selector(_buttonDidClick:)];
+        [_buttonDown setAutoresizingMask:CPViewNotSizable];
+        [self addSubview:_buttonDown];
+
+        [self setNeedsLayout];
     }
 
     return self;
 }
 
-/*! @ignore */
-
-- (void)_init
-{
-    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonUp setContinuous:_autorepeat];
-    [_buttonUp setTarget:self];
-    [_buttonUp setAction:@selector(_buttonDidClick:)];
-    [_buttonUp setAutoresizingMask:CPViewNotSizable];
-    [self addSubview:_buttonUp];
-
-    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonDown setContinuous:_autorepeat];
-    [_buttonDown setTarget:self];
-    [_buttonDown setAction:@selector(_buttonDidClick:)];
-    [_buttonDown setAutoresizingMask:CPViewNotSizable];
-
-    [self setContinuous:_autorepeat];
-    [self addSubview:_buttonDown];
-
-    [self setNeedsLayout];
-}
-
 #pragma mark -
 #pragma mark Superclass overrides
 
-/*!
-    Set if the CPStepper is enabled or not.
+/*! set if the CPStepper is enabled or not
     @param shouldEnabled BOOL that define if stepper is enabled or not.
 */
 - (void)setEnabled:(BOOL)shouldEnabled
@@ -152,30 +121,19 @@
     [_buttonDown setEnabled:shouldEnabled];
 }
 
-
+/*! set the frame of the CPStepper and check if width is not smaller than theme min-size
+    @param aFrame the frame
+*/
 - (void)setFrame:(CGRect)aFrame
 {
-    var upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
-        frame = _CGRectMakeCopy(aFrame);
-
-    frame.size.width = MAX(minSize.width, frame.size.width);
-    frame.size.height = MAX(minSize.height, frame.size.height);
-    [super setFrame:frame];
+    if (aFrame.size.width >= CGRectGetWidth(aFrame))
+        [super setFrame:aFrame];
 }
 
-/*! @ignore */
+/*! @ignore
+*/
 - (void)layoutSubviews
 {
-    var aFrame = [self frame],
-        upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
-        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
-    [_buttonUp setFrame:upFrame];
-    [_buttonDown setFrame:downFrame];
-
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
@@ -184,23 +142,16 @@
     [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
-/*!
-    Set if CPStepper should autorepeat.
+/*! set if CPStepper should autorepeat
     @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
 */
 - (void)setAutorepeat:(BOOL)shouldAutoRepeat
 {
-    if (shouldAutoRepeat !== _autorepeat)
-    {
-        [_buttonUp setContinuous:shouldAutoRepeat];
-        [_buttonDown setContinuous:shouldAutoRepeat];
-    }
-
-    [self setContinuous:shouldAutoRepeat];
+    [_buttonUp setContinuous:shouldAutoRepeat];
+    [_buttonDown setContinuous:shouldAutoRepeat];
 }
 
-/*!
-    Set the current value of the stepper.
+/*! set the current value of the stepper
     @param aValue a float containing the value
 */
 - (void)setDoubleValue:(float)aValue
@@ -216,7 +167,8 @@
 #pragma mark -
 #pragma mark Actions
 
-/*! @ignore */
+/*! @ignore
+*/
 - (IBAction)_buttonDidClick:(id)aSender
 {
     if (![self isEnabled])
@@ -227,11 +179,11 @@
     else
         [self setDoubleValue:([self doubleValue] - _increment)];
 
-    [self sendAction:[self action] to:[self target]];
+    if (_target && _action && [_target respondsToSelector:_action])
+        [self sendAction:_action to:_target];
 }
 
-/*!
-    Perform a programatic click on up button.
+/*! @perform a programatic click on up button
     @param aSender sender of the action
 */
 - (IBAction)performClickUp:(id)aSender
@@ -239,8 +191,7 @@
     [_buttonUp performClick:aSender];
 }
 
-/*!
-    Perform a programatic click on down button.
+/*! @perform a programatic click on down button
     @param aSender sender of the action
 */
 - (IBAction)performClickDown:(id)aSender
@@ -259,51 +210,25 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
-                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null]]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button"]];
 }
 
 @end
 
-@implementation _CPStepperValueBinder : CPBinder
-{
-}
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
-
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
-}
-
-@end
-
-var CPStepperMinValue   = @"CPStepperMinValue",
-    CPStepperMaxValue   = @"CPStepperMaxValue",
-    CPStepperValueWraps = @"CPStepperValueWraps",
-    CPStepperAutorepeat = @"CPStepperAutorepeat",
-    CPStepperIncrement  = @"CPStepperIncrement";
-
-@implementation CPStepper (CPCoding)
+@implementation CPStepper (CPCodingCompliance)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
     {
-        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
-        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
-        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
-        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
-        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
-
-        [self _init];
+        _maxValue   = [aCoder decodeObjectForKey:@"_maxValue"];
+        _minValue   = [aCoder decodeObjectForKey:@"_minValue"];
+        _increment  = [aCoder decodeObjectForKey:@"_increment"];
+        _buttonUp   = [aCoder decodeObjectForKey:@"_buttonUp"];
+        _buttonDown = [aCoder decodeObjectForKey:@"_buttonDown"];
     }
-
     return self;
 }
 
@@ -311,16 +236,11 @@ var CPStepperMinValue   = @"CPStepperMinValue",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
-
-    if (_minValue)
-        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
-    if (_maxValue)
-        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
-    if (_valueWraps)
-        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
-    if (_autorepeat)
-        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
+    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
+    [aCoder encodeObject:_minValue forKey:@"_minValue"];
+    [aCoder encodeObject:_increment forKey:@"_increment"];
+    [aCoder encodeObject:_buttonUp forKey:@"_buttonUp"];
+    [aCoder encodeObject:_buttonDown forKey:@"_buttonDown"];
 }
 
 @end

AppKit/CPString+Additions.j

@@ -0,0 +1,72 @@
+/*
+ * CPString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPAttributedString.
+    The two drawing methods draw a string object with a single set of attributes that apply to the entire string.
+    To draw a string with multiple attributes, such as multiple text fonts, you must use an attributed string.
+*/
+@implementation CPString (AppKitAdditions)
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        run = _CTRunCreate([self copy], attributes);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTRunDraw(run, context, nil);
+}
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it within the given rect.
+
+    @param aRect - The rect for which the string should be drawn into
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawInRect:(CGRect)aRect withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        string = [[CPAttributedString alloc] initWithString:self attributes:attributes];
+        frameSetter = CTFramesetterCreateWithAttributedString(string),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [string length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+
+@end

AppKit/CPTabView.j

@@ -1,25 +1,3 @@
-/*
- * CPTabView.j
- * AppKit
- *
- * Created by Derek Hammer.
- * Copyright 2010, Derek Hammer.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import "CPBox.j"
 @import "CPSegmentedControl.j"
 @import "CPTabViewItem.j"
@@ -67,6 +45,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     if (self = [super initWithFrame:aFrame])
     {
         _items = [CPArray array];
+        _selectedIndex = CPNotFound;
 
         [self _init];
         [self setTabViewType:CPTopTabsBezelBorder];
@@ -77,17 +56,18 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
 - (void)_init
 {
-    _selectedIndex = CPNotFound;
-
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:_CGRectMake(0, 0, 0, 0)];
+    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
     [_tabs setHitTests:NO];
 
     var height = [_tabs valueForThemeAttribute:@"default-height"];
-    [_tabs setFrameSize:_CGSizeMake(0, height)];
+    [_tabs setFrameSize:CGSizeMake(0, height)];
 
     _box = [[CPBox alloc] initWithFrame:[self  bounds]];
     [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
 
+    [_box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    [_tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
+
     [self addSubview:_box];
     [self addSubview:_tabs];
 }
@@ -270,15 +250,17 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Selects the item at the specified index.
     @param anIndex the index of the item to display.
 */
-- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
+- (void)selectTabViewItemAtIndex:(unsigned)anIndex
 {
+    var aTabViewItem = [_items objectAtIndex:anIndex];
+
     if (anIndex === _selectedIndex)
         return;
 
     var aTabViewItem = [self tabViewItemAtIndex:anIndex];
 
     if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
-        return NO;
+        return;
 
     if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
         [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
@@ -288,8 +270,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
     if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
         [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
-
-    return YES;
 }
 
 /*!
@@ -298,10 +278,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    if (_selectedIndex != CPNotFound)
-        return [_items objectAtIndex:_selectedIndex];
-
-    return nil;
+    return [_items objectAtIndex:_selectedIndex];
 }
 
 // Modifying the font
@@ -340,9 +317,21 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     _type = aTabViewType;
 
     if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
+    {
+        [_box setFrame:[self bounds]];
         [_tabs removeFromSuperview];
+    }
     else
+    {
+        var aFrame = [self frame],
+            segmentedHeight = CGRectGetHeight([_tabs frame]),
+            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
+
+        [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
+                                  CGRectGetHeight(aFrame) - segmentedHeight / 2)];
+
         [self addSubview:_tabs];
+    }
 
     switch (_type)
     {
@@ -358,29 +347,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
             [_box setBorderType:CPNoBorder];
             break;
     }
-
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
-    // This means we can't rely on autoresize masks.
-    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
-    {
-        [_box setFrame:[self bounds]];
-    }
-    else
-    {
-        var aFrame = [self frame],
-            segmentedHeight = _CGRectGetHeight([_tabs frame]),
-            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
-
-        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
-                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
-        [self _repositionTabs];
-    }
 }
 
 /*!
@@ -441,30 +407,29 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 {
     var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]];
 
-    if (segmentIndex != CPNotFound && [self selectTabViewItemAtIndex:segmentIndex])
+    if (segmentIndex != CPNotFound)
+    {
+        [self selectTabViewItemAtIndex:segmentIndex];
         [_tabs trackSegment:anEvent];
+    }
 }
 
 - (void)_repositionTabs
 {
-    var horizontalCenterOfSelf = _CGRectGetWidth([self bounds]) / 2,
-        verticalCenterOfTabs = _CGRectGetHeight([_tabs bounds]) / 2;
+    var horizontalCenterOfSelf = CGRectGetWidth([self bounds]) / 2,
+        verticalCenterOfTabs = CGRectGetHeight([_tabs bounds]) / 2;
 
     if (_type === CPBottomTabsBezelBorder)
-        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, _CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
+        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
     else
-        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
+        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }
 
 - (void)_setSelectedIndex:(CPNumber)index
 {
     _selectedIndex = index;
-    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
-}
 
-- (void)_setContentViewFromItem:(CPTabViewItem)anItem
-{
-    [_box setContentView:[anItem view]];
+    [_box setContentView:[[_items objectAtIndex:_selectedIndex] view]];
 }
 
 - (void)_updateItems
@@ -479,7 +444,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     }
 
     if (_selectedIndex === CPNotFound)
+    {
         [self selectFirstTabViewItem:self];
+    }
 }
 
 @end
@@ -502,19 +469,18 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
         [_tabs setFont:_font];
 
         _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
-        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
 
         [self _updateItems];
-
-        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
+        [self _repositionTabs];
 
         var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+
         if (selected)
             [self selectTabViewItem:selected];
 
-        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
 
-        [self setNeedsLayout];
+        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
     }
 
     return self;
@@ -525,10 +491,7 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
     [super encodeWithCoder:aCoder];
 
     [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
-
-    var selected = [self selectedTabViewItem];
-    if (selected)
-        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
 
     [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
     [aCoder encodeObject:_font forKey:CPTabViewFontKey];

AppKit/CPTabViewItem.j

@@ -132,13 +132,7 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
-    if (_view == aView)
-        return;
-
     _view = aView;
-
-    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewFromItem:self];
 }
 
 /*!

AppKit/CPTableColumn.j

@@ -132,7 +132,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 {
     var min = [self minWidth],
         max = [self maxWidth],
-        newWidth = ROUND(MIN(MAX(width, min), max));
+        newWidth = MIN(MAX(width, min), max);
 
     [self setWidth:newWidth];
 
@@ -494,23 +494,16 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (CPSortDescriptor)sortDescriptorPrototype
 {
-    if (_sortDescriptorPrototype)
-        return _sortDescriptorPrototype;
-
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        binding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    return [binding _defaultSortDescriptorPrototype];
+    return _sortDescriptorPrototype;
 }
 
 /*!
-    If YES the tablecolumn will no longer be visible in the tableview.
-    If NO the tablecolumn will be visible in the tableview.
+    If NO the tablecolumn will no longer be visible in the tableview
+    If YES the tablecolumn will be visible in the tableview.
 */
 - (void)setHidden:(BOOL)shouldBeHidden
 {
     shouldBeHidden = !!shouldBeHidden
-
     if (_isHidden === shouldBeHidden)
         return;
 
@@ -576,30 +569,6 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
 }
 
-- (CPSortDescriptor)_defaultSortDescriptorPrototype
-{
-    if (![self createsSortDescriptor])
-        return nil;
-
-    var keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        dotIndex = keyPath.indexOf(".");
-
-    if (dotIndex === CPNotFound)
-        return nil;
-
-    var firstPart = keyPath.substring(0, dotIndex),
-        key = keyPath.substring(dotIndex + 1);
-
-    return [CPSortDescriptor sortDescriptorWithKey:key ascending:YES];
-}
-
-- (BOOL)createsSortDescriptor
-{
-    var options = [_info objectForKey:CPOptionsKey],
-        optionValue = [options objectForKey:CPCreatesSortDescriptorBindingOption];
-    return optionValue === nil ? YES : [optionValue boolValue];
-}
-
 @end
 
 @implementation CPTableColumn (Bindings)
@@ -625,22 +594,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
 
     if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-    {
-        // Bind the table to the array controller this column is bound to.
-        // Note that anObject might not be the array controller. E.g. the keypath could be something like
-        // somePathTo.anArrayController.arrangedObjects.aKey. Cocoa doesn't support this but it is consistent
-        // and it makes sense.
-        var acIndex = aKeyPath.lastIndexOf("arrangedObjects."),
-            arrayController = anObject;
-
-        if (acIndex > 1)
-        {
-            var firstPart = aKeyPath.substring(0, acIndex - 1);
-            arrayController = [anObject valueForKeyPath:firstPart];
-        }
-
-        [[self tableView] _establishBindingsIfUnbound:arrayController];
-    }
+        [[self tableView] _establishBindingsIfUnbound:anObject];
 }
 
 /*!
@@ -709,11 +663,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
             bindingInfo = binding._info,
             destination = [bindingInfo objectForKey:CPObservedObjectKey],
             keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
-            options = [bindingInfo objectForKey:CPOptionsKey],
             dotIndex = keyPath.lastIndexOf(".");
 
-        newValue = [binding reverseTransformValue:newValue withOptions:options];
-
         if (dotIndex === CPNotFound)
             [[destination valueForKeyPath:keyPath] replaceObjectAtIndex:aRow withObject:newValue];
         else
@@ -730,6 +681,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
     }
 }
 
+//- (void)objectValue
+//{
+//    return nil;
+//}
+
 @end
 
 var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
@@ -763,6 +719,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
         [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
         [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
         [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
 
         _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
         _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];

AppKit/CPTableHeaderView.j

@@ -39,8 +39,8 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], CPLeftTextAlignment, CPLineBreakByTruncatingTail, CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[@"background-color", @"text-alignment", @"line-break-mode", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
+                                       forKeys:[@"background-color", @"text-alignment", @"text-inset", @"text-color", @"text-font", @"text-shadow-color", @"text-shadow-offset"]];
 }
 
 - (void)initWithFrame:(CGRect)frame
@@ -74,11 +74,10 @@
 
     [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
     [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
-    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"text-font"]];
     [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
     [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
     [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
-    [_textField setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
 }
 
 - (void)setStringValue:(CPString)string
@@ -103,52 +102,7 @@
 
 - (void)setFont:(CPFont)aFont
 {
-    [self setValue:aFont forThemeAttribute:@"font"];
-}
-
-- (CPFont)font
-{
-    return [self currentValueForThemeAttribute:@"font"]
-}
-
-- (void)setAlignment:(CPTextAlignment)alignment
-{
-    [self setValue:alignment forThemeAttribute:@"text-alignment"];
-}
-
-- (CPTextAlignment)alignment
-{
-    return [self currentValueForThemeAttribute:@"text-alignment"]
-}
-
-- (void)setLineBreakMode:(CPLineBreakMode)mode
-{
-    [self setValue:mode forThemeAttribute:@"line-break-mode"];
-}
-
-- (CPLineBreakMode)lineBreakMode
-{
-    return [self currentValueForThemeAttribute:@"line-break-mode"]
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    [self setValue:aColor forThemeAttribute:@"text-color"];
-}
-
-- (CPColor)textColor
-{
-    return [self currentValueForThemeAttribute:@"text-color"]
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
-}
-
-- (CPColor)textShadowColor
-{
-    return [self currentValueForThemeAttribute:@"text-shadow-color"]
+    [self setValue:aFont forThemeAttribute:"text-font"];
 }
 
 - (void)_setIndicatorImage:(CPImage)anImage
@@ -168,10 +122,6 @@
 
 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
     _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
-    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
-    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
-    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
-    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
     _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
 
 @implementation _CPTableColumnHeaderView (CPCoding)
@@ -184,10 +134,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
         [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
         [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
-        [self setTextColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextColorKey]];
-        [self setTextShadowColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextShadowColorKey]];
-        [self setAlignment:[aCoder decodeIntForKey:_CPTableColumnHeaderViewAlignmentKey]];
-        [self setLineBreakMode:[aCoder decodeIntForKey:_CPTableColumnHeaderViewLineBreakModeKey]];
     }
 
     return self;
@@ -199,11 +145,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
     [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
     [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [aCoder encodeObject:[self font] forKey:_CPTableColumnHeaderViewFontKey];
-    [aCoder encodeObject:[self textColor] forKey:_CPTableColumnHeaderViewTextColorKey];
-    [aCoder encodeObject:[self textShadowColor] forKey:_CPTableColumnHeaderViewTextShadowColorKey];
-    [aCoder encodeInt:[self alignment] forKey:_CPTableColumnHeaderViewAlignmentKey];
-    [aCoder encodeInt:[self lineBreakMode] forKey:_CPTableColumnHeaderViewLineBreakModeKey];
+    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
 }
 
 @end
@@ -701,7 +643,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX = _CGRectGetMaxX(columnToStroke);
 
         CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
     }
     CGContextClosePath(context);
     CGContextStrokePath(context);

AppKit/CPTableView.j

@@ -29,7 +29,6 @@
 @import "CPTableColumn.j"
 @import "_CPCornerView.j"
 @import "CPScroller.j"
-@import "CPCompatibility.j"
 
 
 CPTableViewColumnDidMoveNotification        = @"CPTableViewColumnDidMoveNotification";
@@ -88,9 +87,9 @@ CPTableViewSelectionHighlightStyleNone = -1;
 CPTableViewSelectionHighlightStyleRegular = 0;
 CPTableViewSelectionHighlightStyleSourceList = 1;
 
-CPTableViewGridNone                     = 0;
-CPTableViewSolidVerticalGridLineMask    = 1 << 0;
-CPTableViewSolidHorizontalGridLineMask  = 1 << 1;
+CPTableViewGridNone                    = 0;
+CPTableViewSolidVerticalGridLineMask   = 1 << 0;
+CPTableViewSolidHorizontalGridLineMask = 1 << 1;
 
 CPTableViewNoColumnAutoresizing = 0;
 CPTableViewUniformColumnAutoresizingStyle = 1; // FIX ME: This is FUBAR
@@ -222,7 +221,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
     SEL                 _doubleAction;
     CPInteger           _clickedRow;
-    CPInteger           _clickedColumn;
     unsigned            _columnAutoResizingStyle;
 
     int                 _lastTrackedRowIndex;
@@ -241,7 +239,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     BOOL                _disableAutomaticResizing @accessors(property=disableAutomaticResizing);
     BOOL                _lastColumnShouldSnap;
     BOOL                _implementsCustomDrawRow;
-    BOOL                _contentBindingExpicitelySet;
 
     CPTableColumn       _draggedColumn;
     CPArray             _differedColumnDataToRemove;
@@ -260,8 +257,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:["alternating-row-colors", "grid-color", "highlighted-grid-color", "selection-color", "sourcelist-selection-color", "sort-image", "sort-image-reversed", "selection-radius"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:["alternating-row-colors", "grid-color", "highlighted-grid-color", "selection-color", "sourcelist-selection-color", "sort-image", "sort-image-reversed"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -308,7 +305,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _retargetedDropOperation = nil;
         _dragOperationDefaultMask = nil;
         _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
-        _contentBindingExpicitelySet = NO;
 
         [self setBackgroundColor:[CPColor whiteColor]];
         [self _init];
@@ -325,7 +321,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 - (void)_init
 {
-    _lastSelectedRow = _clickedColumn = _clickedRow = -1;
+    _tableViewFlags = 0;
+    _lastSelectedRow = -1;
 
     _selectedColumnIndexes = [CPIndexSet indexSet];
     _selectedRowIndexes = [CPIndexSet indexSet];
@@ -338,17 +335,19 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (!_alternatingRowBackgroundColors)
         _alternatingRowBackgroundColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];
 
+    _selectionHighlightColor = [CPColor colorWithHexString:@"5f83b9"];
+
     _tableColumnRanges = [];
     _dirtyTableColumnRangeIndex = 0;
     _numberOfHiddenColumns = 0;
 
     _objectValues = { };
     _dataViewsForTableColumns = { };
+    _dataViews =  [];
     _numberOfRows = 0;
     _exposedRows = [CPIndexSet indexSet];
     _exposedColumns = [CPIndexSet indexSet];
     _cachedDataViews = { };
-
     _cachedRowHeights = [];
 
     _groupRows = [CPIndexSet indexSet];
@@ -510,11 +509,6 @@ NOT YET IMPLEMENTED
     _objectValues = { };
     _cachedRowHeights = [];
 
-    // Otherwise, if we have a row marked as group with a
-    // index greater than the new number or rows
-    // it keeps the the graphical group style.
-    [_groupRows removeAllIndexes];
-
     // This updates the size too.
     [self noteNumberOfRowsChanged];
 
@@ -543,12 +537,8 @@ NOT YET IMPLEMENTED
 }
 
 /*
-    Returns the index of the the column the user clicked to trigger an action, or -1 if no column was clicked.
+    * - clickedColumn
 */
-- (CPInteger)clickedColumn
-{
-    return _clickedColumn;
-}
 
 /*!
     Returns the index of the the row the user clicked to trigger an action, or -1 if no row was clicked.
@@ -688,7 +678,6 @@ NOT YET IMPLEMENTED
 */
 - (void)setRowHeight:(unsigned)aRowHeight
 {
-    // Accept row heights such as "0".
     aRowHeight = +aRowHeight;
 
     if (_rowHeight === aRowHeight)
@@ -732,7 +721,7 @@ NOT YET IMPLEMENTED
 
 - (void)setAlternatingRowBackgroundColors:(CPArray)alternatingRowBackgroundColors
 {
-    [self setValue:alternatingRowBackgroundColors forThemeAttribute:@"alternating-row-colors"];
+    [self setValue:alternatingRowBackgroundColors forThemeAttribute:"alternating-row-colors"];
 
     [self setNeedsDisplay:YES];
 }
@@ -774,6 +763,10 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightStyle:(unsigned)aSelectionHighlightStyle
 {
+    //early return for IE.
+    if (aSelectionHighlightStyle == CPTableViewSelectionHighlightStyleSourceList && !CPFeatureIsCompatible(CPHTMLCanvasFeature))
+        return;
+
     _selectionHighlightStyle = aSelectionHighlightStyle;
     [self setNeedsDisplay:YES];
 
@@ -790,7 +783,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightColor:(CPColor)aColor
 {
-    [self setValue:aColor forThemeAttribute:@"selection-color"];
+    [self setValue:aColor forThemeAttribute:"selection-color"];
 
     [self setNeedsDisplay:YES];
 }
@@ -816,7 +809,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionGradientColors:(CPDictionary)aDictionary
 {
-    [self setValue:aDictionary forThemeAttribute:@"sourcelist-selection-color"];
+    [self setValue:aDictionary forThemeAttribute:"sourcelist-selection-color"];
 
     [self setNeedsDisplay:YES];
 }
@@ -840,7 +833,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setGridColor:(CPColor)aColor
 {
-    [self setValue:aColor forThemeAttribute:@"grid-color"];
+    [self setValue:aColor forThemeAttribute:"grid-color"];
 
     [self setNeedsDisplay:YES];
 }
@@ -960,7 +953,6 @@ NOT YET IMPLEMENTED
 */
 - (void)_moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
 {
-    // Convert parameters such as "0" to 0.
     fromIndex = +fromIndex;
     toIndex = +toIndex;
 
@@ -984,13 +976,6 @@ NOT YET IMPLEMENTED
         columnIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(fromIndex, toIndex)];
 
     [self reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
-
-    // Notify even if programmatically moving a column as in Cocoa.
-    // TODO Only notify when a column drag operation ends, not each time a column reaches a new slot?
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPTableViewColumnDidMoveNotification
-                                                        object:self
-                                                      userInfo:[CPDictionary dictionaryWithObjects:[fromIndex, toIndex]
-                                                                                           forKeys:[@"CPOldColumn", @"CPNewColumn"]]];
 }
 
 /*!
@@ -1273,7 +1258,7 @@ NOT YET IMPLEMENTED
 */
 - (int)selectedColumn
 {
-    return [_selectedColumnIndexes lastIndex];
+    [_selectedColumnIndexes lastIndex];
 }
 
 /*!
@@ -1525,8 +1510,6 @@ NOT YET IMPLEMENTED
 
     if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self)
         [scrollView _updateCornerAndHeaderView];
-
-    [self setNeedsLayout];
 }
 
 // Complexity:
@@ -1578,7 +1561,6 @@ NOT YET IMPLEMENTED
 */
 - (CGRect)rectOfColumn:(CPInteger)aColumnIndex
 {
-    // Convert e.g. "0" to 0.
     aColumnIndex = +aColumnIndex;
 
     if (aColumnIndex < 0 || aColumnIndex >= NUMBER_OF_COLUMNS())
@@ -1808,7 +1790,7 @@ NOT YET IMPLEMENTED
 {
     if (_implementedDelegateMethods & CPTableViewDelegate_tableView_heightOfRow_)
     {
-            return [_cachedRowHeights indexOfObject:aPoint
+            return idx = [_cachedRowHeights indexOfObject:aPoint
                                             inSortedRange:nil
                                                   options:0
                                           usingComparator:function(aPoint, rowCache)
@@ -2002,7 +1984,7 @@ NOT YET IMPLEMENTED
     // so we should size the last resized to fit
 
     // find the last visisble column
-    while (count-- && [_tableColumns[count] isHidden]);
+    while (count-- && [_tableColumns[count] isHidden]) ;
 
     // find the max x, but subtract a single pixel since the spacing isn't applicable here.
     var delta = superviewWidth - _CGRectGetMaxX([self rectOfColumn:count]) - ([self intercellSpacing].width || 1),
@@ -2650,7 +2632,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (_allowsColumnSelection)
     {
         [self _noteSelectionIsChanging];
-        if (modifierFlags & CPPlatformActionKeyMask)
+        if (modifierFlags & CPCommandKeyMask)
         {
             if ([self isColumnSelected:clickedColumn])
                 [self deselectColumn:clickedColumn];
@@ -2701,7 +2683,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         oldMainSortDescriptor = [[self sortDescriptors] objectAtIndex: 0];
 
     // Remove every main descriptor equivalents (normally only one)
-    while ((descriptor = [e nextObject]) !== nil)
+    while ((descriptor = [e nextObject]) != nil)
     {
         if ([[descriptor key] isEqual: [newMainSortDescriptor key]])
             [outdatedDescriptors addObject:descriptor];
@@ -2741,7 +2723,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)_tableHeaderSortImage
 {
-    return [self currentValueForThemeAttribute:@"sort-image"];
+    return [self currentValueForThemeAttribute:"sort-image"];
 }
 
 /*!
@@ -2749,7 +2731,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)_tableHeaderReverseSortImage
 {
-    return [self currentValueForThemeAttribute:@"sort-image-reversed"];
+    return [self currentValueForThemeAttribute:"sort-image-reversed"];
 }
 
 /*!
@@ -2788,7 +2770,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
-    return [rowIndexes count] > 0 && [self numberOfRows] > 0;
+    return YES;
 }
 
 /*!
@@ -2839,8 +2821,11 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             var dataView = [self _newDataViewForRow:row tableColumn:tableColumn];
 
             [dataView setFrame:[self frameOfDataViewAtColumn:columnIndex row:row]];
+            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
+
+            // If the column uses content bindings, allow them to override the objectValueForTableColumn.
+            [tableColumn _prepareDataView:dataView forRow:row];
 
-            [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
             [view addSubview:dataView];
 
             row = [theDraggedRows indexGreaterThanIndex:row];
@@ -2881,14 +2866,19 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
         [dataView setFrame:dataViewFrame];
 
-        [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
+        [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
         [dragView addSubview:dataView];
 
         row = [_exposedRows indexGreaterThanIndex:row];
     }
 
-    // Add a copy of the header view.
-    var columnHeaderView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:headerView]];
+    // Add the column header view
+    var headerFrame = [headerView frame];
+    headerFrame.origin = _CGPointMakeZero();
+
+    var columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
+    [columnHeaderView setStringValue:[headerView stringValue]];
+    [columnHeaderView setThemeState:[headerView themeState]];
     [dragView addSubview:columnHeaderView];
 
     [dragView setBackgroundColor:[CPColor whiteColor]];
@@ -3054,6 +3044,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     return _sortDescriptors;
 }
 
+
 /*!
     @ignore
 */
@@ -3275,8 +3266,11 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
                 isTextField = [dataView isKindOfClass:[CPTextField class]];
 
             [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
+            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
 
-            [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
+            // This gives the table column an opportunity to apply its bindings.
+            // It will override the value set above if there is a binding.
+            [tableColumn _prepareDataView:dataView forRow:row];
 
             if (isColumnSelected || [self isRowSelected:row])
                 [dataView setThemeState:CPThemeStateSelectedDataView];
@@ -3334,30 +3328,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     }
 }
 
-- (void)_setObjectValueForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow forView:(CPView)aDataView
-{
-    if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_objectValueForTableColumn_row_)
-        [aDataView setObjectValue:[self _objectValueForTableColumn:aTableColumn row:aRow]];
-
-    // This gives the table column an opportunity to apply its bindings.
-    // It will override the value set above if there is a binding.
-
-    if (_contentBindingExpicitelySet)
-        [self _prepareContentBindedDataView:aDataView forRow:aRow];
-    else
-    // For both cell-based and view-based
-        [aTableColumn _prepareDataView:aDataView forRow:aRow];
-}
-
-- (void)_prepareContentBindedDataView:(CPView)dataView forRow:(CPInteger)aRow
-{
-    var binder = [CPTableContentBinder getBinding:@"content" forObject:self],
-        content = [binder content],
-        rowContent = [content objectAtIndex:aRow];
-
-    [dataView setObjectValue:rowContent];
-}
-
 /*!
     @ignore
 */
@@ -3381,15 +3351,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             rowIndex = 0,
             rowsCount = rowArray.length;
 
-        if (dataViewsForTableColumn)
+        for (; rowIndex < rowsCount; ++rowIndex)
         {
-            for (; rowIndex < rowsCount; ++rowIndex)
-            {
-                var row = rowArray[rowIndex],
-                    dataView = dataViewsForTableColumn[row];
+            var row = rowArray[rowIndex],
+                dataView = dataViewsForTableColumn[row];
 
-                [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
-            }
+            [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
         }
     }
 }
@@ -3401,14 +3368,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_commitDataViewObjectValue:(id)sender
 {
-    /*
-        makeFirstResponder at the end of this method causes the dataview to resign.
-        If the dataview resigning triggers the action (as CPTextField does), we come right
-        back here and start an infinite loop. So we have to check this flag first.
-    */
-    if ([sender respondsToSelector:@selector(sendsActionOnEndEditing)] && [sender sendsActionOnEndEditing] && _editingCellIndex === nil)
-        return;
-
     _editingCellIndex = nil;
 
     if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_setObjectValue_forTableColumn_row_)
@@ -3466,6 +3425,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         [aTableColumn setDataView:dataView];
     }
 
+
     return [aTableColumn _newDataViewForRow:aRow];
 }
 
@@ -3537,20 +3497,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
     [super setNeedsDisplay:aFlag];
     [_tableDrawView setNeedsDisplay:aFlag];
-
-    [[self headerView] setNeedsDisplay:YES];
 }
 
-/*!
-    @ignore
-*/
-- (void)setNeedsLayout
-{
-    [super setNeedsLayout];
-    [[self headerView] setNeedsLayout];
-}
-
-
 /*!
     @ignore
 */
@@ -3596,16 +3544,16 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     }
 
     var exposedRows = [self _unboundedRowsInRect:aRect],
-        firstRow = FLOOR(exposedRows.location / colorCount) * colorCount,
         lastRow = CPMaxRange(exposedRows),
         colorIndex = 0,
-        groupRowRects = [];
+        groupRowRects = [],
+        row = exposedRows.location;
 
     //loop through each color so we only draw once for each color
     while (colorIndex < colorCount)
     {
         CGContextBeginPath(context);
-        for (var row = firstRow + colorIndex; row <= lastRow; row += colorCount)
+        for (var row = colorIndex; row <= lastRow; row += colorCount)
         {
             // if it's not a group row draw it otherwise we draw it later
             if (![_groupRows containsIndex:row])
@@ -3732,13 +3680,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         [_selectedColumnIndexes getIndexes:indexes maxCount:-1 inIndexRange:exposedRange];
     }
 
-    var count,
-        count2 = count = [indexes count];
+    var count = count2 = [indexes count];
 
     if (!count)
         return;
 
-    var drawGradient = (CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
+    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
         deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);
 
     CGContextBeginPath(context);
@@ -3758,7 +3705,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     {
         var topGroupLineColor = [CPColor colorWithCalibratedWhite:212.0 / 255.0 alpha:1.0],
             bottomGroupLineColor = [CPColor colorWithCalibratedWhite:185.0 / 255.0 alpha:1.0],
-            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0, 1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0, 1.0], [0, 1], 2);
+            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0,1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0,1.0], [0,1], 2);
     }
 
     while (count--)
@@ -3805,25 +3752,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             CGContextStrokePath(context);
         }
         else
-        {
-            var radius = [self currentValueForThemeAttribute:@"selection-radius"];
-
-            if (radius > 0)
-            {
-                var minX = CGRectGetMinX(rowRect),
-                    maxX = CGRectGetMaxX(rowRect),
-                    minY = CGRectGetMinY(rowRect),
-                    maxY = CGRectGetMaxY(rowRect);
-
-                CGContextMoveToPoint(context, minX + radius, minY);
-                CGContextAddArcToPoint(context, maxX, minY, maxX, minY + radius, radius);
-                CGContextAddArcToPoint(context, maxX, maxY, maxX - radius, maxY, radius);
-                CGContextAddArcToPoint(context, minX, maxY, minX, maxY - radius, radius);
-                CGContextAddArcToPoint(context, minX, minY, minX + radius, minY, radius);
-            }
-            else
-                CGContextAddRect(context, rowRect);
-        }
+            CGContextAddRect(context, rowRect);
     }
 
     CGContextClosePath(context);
@@ -3872,7 +3801,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     }
 
     CGContextClosePath(context);
-    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"highlighted-grid-color"]);
+    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:"highlighted-grid-color"]);
     CGContextStrokePath(context);
 }
 
@@ -3883,7 +3812,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_drawGroupRowsForRects:(CPArray)rects
 {
-    if ((CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList) || !rects.length)
+    if (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList || !rects.length)
         return;
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
@@ -3894,8 +3823,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     var gradientCache = [self selectionGradientColors],
         topLineColor = [CPColor colorWithHexString:"d3d3d3"],
         bottomLineColor = [CPColor colorWithHexString:"bebebd"],
-        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0, 1.0,
-                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0, 1.0], [0, 1], 2),
+        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0,1.0,
+                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0,1.0], [0,1], 2),
         drawGradient = YES;
 
     while (i--)
@@ -4041,12 +3970,9 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    // Try to become the first responder, but if we can't, that's okay.
-    [[self window] makeFirstResponder:self];
-
     var row = [self rowAtPoint:aPoint];
 
-    // If the user clicks outside a row then deselect everything.
+    //if the user clicks outside a row then deselect everything
     if (row < 0 && _allowsEmptySelection)
         [self selectRowIndexes:[CPIndexSet indexSet] byExtendingSelection:NO];
 
@@ -4071,6 +3997,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (row >= 0 && !(_implementedDataSourceMethods & CPTableViewDataSource_tableView_writeRowsWithIndexes_toPasteboard_))
         [self _updateSelectionWithMouseAtRow:row];
 
+    [[self window] makeFirstResponder:self];
     return YES;
 }
 
@@ -4196,7 +4123,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     _isSelectingSession = NO;
 
     var CLICK_TIME_DELTA = 1000,
-        columnIndex = -1,
+        columnIndex,
         column,
         rowIndex,
         shouldEdit = YES;
@@ -4204,7 +4131,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_writeRowsWithIndexes_toPasteboard_)
     {
         rowIndex = [self rowAtPoint:aPoint];
-
         if (rowIndex !== -1)
         {
             if ([_draggedRowIndexes count] > 0)
@@ -4226,15 +4152,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             || [self infoForBinding:@"content"]))
     {
         columnIndex = [self columnAtPoint:lastPoint];
-
         if (columnIndex !== -1)
         {
             column = _tableColumns[columnIndex];
-
             if ([column isEditable])
             {
                 rowIndex = [self rowAtPoint:aPoint];
-
                 if (rowIndex !== -1)
                 {
                     if (_implementedDelegateMethods & CPTableViewDelegate_tableView_shouldEditTableColumn_row_)
@@ -4254,7 +4177,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if ([[CPApp currentEvent] clickCount] === 2 && _doubleAction)
     {
         _clickedRow = [self rowAtPoint:aPoint];
-        _clickedColumn = [self columnAtPoint:lastPoint];
         [self sendAction:_doubleAction to:_target];
     }
 }
@@ -4687,7 +4609,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             }
             _wasSelectionBroken = true;
         }
-        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastIndex])))
+        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastindex])))
         {
             shouldGoUpward ? i = [selectedIndexes firstIndex] - 1 : i = [selectedIndexes lastIndex];
             _wasSelectionBroken = false;
@@ -4715,19 +4637,19 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         while (![_delegate tableView:self shouldSelectRow:i] && (i < [self numberOfRows] || i > 0))
             shouldGoUpward ? i-- : i++; //check to see if the row can be selected if it can't be then see if the next row can be selected
 
-        // If the index still can be selected after the loop then just return.
-        if (![_delegate tableView:self shouldSelectRow:i])
-            return;
+        //if the index still can be selected after the loop then just return
+         if (![_delegate tableView:self shouldSelectRow:i])
+             return;
     }
 
-    // If we go upward and see that this row is already selected we should deselect the row below.
-    if (extend && [selectedIndexes containsIndex:i])
+    // if we go upward and see that this row is already selected we should deselect the row below
+    if ([selectedIndexes containsIndex:i] && extend)
     {
-        // The row we're on is the last to be selected.
+        // the row we're on is the last to be selected
         var differedLastSelectedRow = i;
 
         // no remove the one before/after it
-        shouldGoUpward ? i++ : i--;
+        shouldGoUpward ? i++  : i--;
 
         [selectedIndexes removeIndex:i];
 
@@ -4739,7 +4661,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         if ([selectedIndexes containsIndex:i])
         {
             i = shouldGoUpward ? [selectedIndexes firstIndex] -1 : [selectedIndexes lastIndex] + 1;
-            i = MIN(MAX(i, 0), [self numberOfRows] - 1);
+            i = MIN(MAX(i,0), [self numberOfRows] - 1);
         }
 
         [selectedIndexes addIndex:i];
@@ -4764,14 +4686,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 
 @implementation CPTableView (Bindings)
 
-+ (id)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == @"content")
-        return [CPTableContentBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 /*!
     @ignore
 */
@@ -4789,45 +4703,17 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 - (void)_establishBindingsIfUnbound:(id)destination
 {
     if ([[self infoForBinding:@"content"] objectForKey:CPObservedObjectKey] !== destination)
-    {
-        [super bind:@"content" toObject:destination withKeyPath:@"arrangedObjects" options:nil];
-        _contentBindingExpicitelySet = NO;
-    }
+        [self bind:@"content" toObject:destination withKeyPath:@"arrangedObjects" options:nil];
 
-    // If the content binding was set manually assume the user is taking manual control of establishing bindings.
-    if (!_contentBindingExpicitelySet)
-    {
-        if ([[self infoForBinding:@"selectionIndexes"] objectForKey:CPObservedObjectKey] !== destination)
-            [self bind:@"selectionIndexes" toObject:destination withKeyPath:@"selectionIndexes" options:nil];
+    if ([[self infoForBinding:@"selectionIndexes"] objectForKey:CPObservedObjectKey] !== destination)
+        [self bind:@"selectionIndexes" toObject:destination withKeyPath:@"selectionIndexes" options:nil];
 
-        if ([[self infoForBinding:@"sortDescriptors"] objectForKey:CPObservedObjectKey] !== destination)
-            [self bind:@"sortDescriptors" toObject:destination withKeyPath:@"sortDescriptors" options:nil];
-    }
+    //[self bind:@"sortDescriptors" toObject:destination withKeyPath:@"sortDescriptors" options:nil];
 }
 
-- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
+- (void)setContent:(CPArray)content
 {
-    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
-
-    if (aBinding == @"content")
-        _contentBindingExpicitelySet = YES;
-}
-
-@end
-
-@implementation CPTableContentBinder : CPBinder
-{
-    id _content @accessors(property=content);
-}
-
-- (void)setValueFor:(id)aBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey];
-
-    _content = [destination valueForKey:keyPath];
-
-    [_source reloadData];
+    [self reloadData];
 }
 
 @end
@@ -4875,14 +4761,15 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey] || [];
         [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];
 
-        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey] || 23.0;
-        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey];
+        if ([aCoder containsValueForKey:CPTableViewRowHeightKey])
+            _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
+        else
+            _rowHeight = 23.0;
 
-        if (_CGSizeEqualToSize(_intercellSpacing, _CGSizeMakeZero()))
-            _intercellSpacing = _CGSizeMake(3.0, 2.0);
+        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey] || _CGSizeMake(3.0, 2.0);
 
         [self setGridColor:[aCoder decodeObjectForKey:CPTableViewGridColorKey]];
-        _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey];
+        _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey] || CPTableViewGridNone;
 
         _usesAlternatingRowBackgroundColors = [aCoder decodeObjectForKey:CPTableViewUsesAlternatingBackgroundKey];
         [self setAlternatingRowBackgroundColors:[aCoder decodeObjectForKey:CPTableViewAlternatingRowColorsKey]];
@@ -4949,8 +4836,9 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
 
     while (index != CPNotFound)
     {
-        var indexSet = (switchFlag) ? otherSet : self,
-            otherIndex = [indexSet indexGreaterThanOrEqualToIndex:index];
+        var indexSet = (switchFlag) ? otherSet : self;
+
+        otherIndex = [indexSet indexGreaterThanOrEqualToIndex:index];
 
         if (otherIndex == index)
         {
@@ -5050,17 +4938,15 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
 
     isBlinking = YES;
 
-    var showCallback = function()
-    {
+    var showCallback = function() {
         objj_msgSend(self, "setHidden:", NO)
         isBlinking = NO;
-    };
+    }
 
-    var hideCallback = function()
-    {
+    var hideCallback = function() {
         objj_msgSend(self, "setHidden:", YES)
         isBlinking = YES;
-    };
+    }
 
     objj_msgSend(self, "setHidden:", YES);
     [CPTimer scheduledTimerWithTimeInterval:0.1 callback:showCallback repeats:NO];

AppKit/CPTextField.j

@@ -1,3 +1,4 @@
+
 /*
  * CPTextField.j
  * AppKit
@@ -20,15 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
 @import "_CPImageAndTextView.j"
 
 
-CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
+CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
@@ -46,44 +45,12 @@ var CPTextFieldDOMInputElement = nil,
     CPTextFieldInputIsActive = NO,
     CPTextFieldCachedSelectStartFunction = nil,
     CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurHandler = nil,
-    CPTextFieldInputFunction = nil;
+    CPTextFieldBlurFunction = nil;
 
 #endif
 
 var CPSecureTextFieldCharacter = "\u2022";
 
-
-function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
-{
-    if (owner && domElement != inputElement.parentNode)
-        return;
-
-    if (!resigning && [[owner window] isKeyWindow])
-    {
-        /*
-            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus.
-        */
-        window.setTimeout(function()
-        {
-            inputElement.focus();
-        }, 0.0);
-    }
-
-    CPTextFieldHandleBlur(anEvent, AT_REF(owner));
-    AT_DEREF(didBlurRef, YES);
-
-    return true;
-}
-
-function CPTextFieldHandleBlur(anEvent, ownerRef)
-{
-    AT_DEREF(ownerRef, nil);
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
-
-
 @implementation CPString (CPTextFieldAdditions)
 
 /*!
@@ -116,11 +83,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     CPColor                 _textFieldBackgroundColor;
 
-    CPString                _placeholderString;
-    CPString                _stringValue;
+    id                      _placeholderString;
 
     id                      _delegate;
 
+    CPString                _textDidChangeValue;
+
     // NS-style Display Properties
     CPTextFieldBezelStyle   _bezelStyle;
     BOOL                    _isBordered;
@@ -219,45 +187,32 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldDOMInputElement.style.background = "transparent";
         CPTextFieldDOMInputElement.style.outline = "none";
 
-        CPTextFieldBlurHandler = function(anEvent)
+        CPTextFieldBlurFunction = function(anEvent)
         {
-            return CPTextFieldBlurFunction(
-                        anEvent,
-                        CPTextFieldInputOwner,
-                        CPTextFieldInputOwner._DOMElement,
-                        CPTextFieldDOMInputElement,
-                        CPTextFieldInputResigning,
-                        AT_REF(CPTextFieldInputDidBlur));
-        };
+            if (CPTextFieldInputOwner && CPTextFieldInputOwner._DOMElement != CPTextFieldDOMInputElement.parentNode)
+                return;
 
-        if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
-        {
-            CPTextFieldInputFunction = function(anEvent)
+            if (!CPTextFieldInputResigning)
             {
-                if (!CPTextFieldInputOwner)
-                    return;
-
-                var cappEvent = [CPEvent keyEventWithType:CPKeyUp
-                                                 location:_CGPointMakeZero()
-                                            modifierFlags:0
-                                                timestamp:[CPEvent currentTimestamp]
-                                             windowNumber:[[CPApp keyWindow] windowNumber]
-                                                  context:nil
-                                               characters:nil
-                              charactersIgnoringModifiers:nil
-                                                isARepeat:NO
-                                                  keyCode:nil];
-
-                [CPTextFieldInputOwner keyUp:cappEvent];
-
-                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+                [[CPTextFieldInputOwner window] makeFirstResponder:nil];
+                return;
             }
 
-            CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
+            CPTextFieldHandleBlur(anEvent, CPTextFieldDOMInputElement);
+            CPTextFieldInputDidBlur = YES;
+
+            return true;
         }
 
-        // FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;
+        CPTextFieldHandleBlur = function(anEvent)
+        {
+            CPTextFieldInputOwner = nil;
+
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        }
+
+        //FIXME make this not onblur
+        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
 
         CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
     }
@@ -286,7 +241,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMPasswordInputElement.style.outline = "none";
             CPTextFieldDOMPasswordInputElement.type = "password";
 
-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
+            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
         }
 
         CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
@@ -333,11 +288,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (shouldBeEditable)
         _isSelectable = YES;
 
-    if (_isEditable)
-        [self setThemeState:CPThemeStateEditable];
-    else
-        [self unsetThemeState:CPThemeStateEditable];
-
     // We only allow first responder status if the field is editable and enabled.
     if (!shouldBeEditable && [[self window] firstResponder] === self)
         [[self window] makeFirstResponder:nil];
@@ -519,44 +469,31 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
-    // As long as we are the first responder we need to monitor the key status of our window.
-    [self _setObserveWindowKeyNotifications:YES];
+#if PLATFORM(DOM)
+    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
+        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
+#endif
 
-    _isEditing = NO;
-
-    if ([[self window] isKeyWindow])
-        [self _becomeFirstKeyResponder];
-
-    return YES;
-}
-
-/*!
-    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non-key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
-
-    Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
-*/
-- (void)_becomeFirstKeyResponder
-{
     [self setThemeState:CPThemeStateEditing];
 
     [self _updatePlaceholderState];
 
     [self setNeedsLayout];
 
-    _stringValue = [self stringValue];
+    _isEditing = NO;
 
 #if PLATFORM(DOM)
 
-    var element = [self _inputElement],
-        font = [self currentValueForThemeAttribute:@"font"],
-        lineHeight = [font defaultLineHeightForFont];
+    var string = [self stringValue],
+        element = [self _inputElement],
+        font = [self currentValueForThemeAttribute:@"font"];
 
-    element.value = _stringValue;
+    // generate the font metric
+    [font _getMetrics];
+
+    element.value = string;
     element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
-
-    if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
-        element.style.font = [font cssString];
-
+    element.style.font = [font cssString];
     element.style.zIndex = 1000;
 
     switch ([self alignment])
@@ -574,41 +511,44 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     switch (verticalAlign)
     {
         case CPTopVerticalTextAlignment:
-            var topPoint = _CGRectGetMinY(contentRect) + "px";
+            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px"; // for the same reason we have a -1 for the left, we also have a + 1 here
             break;
 
         case CPCenterVerticalTextAlignment:
-            var topPoint = (_CGRectGetMidY(contentRect) - (lineHeight / 2)) + "px";
+            var topPoint = (_CGRectGetMidY(contentRect) - (font._lineHeight / 2) + 1) + "px";
             break;
 
         case CPBottomVerticalTextAlignment:
-            var topPoint = (_CGRectGetMaxY(contentRect) - lineHeight) + "px";
+            var topPoint = (_CGRectGetMaxY(contentRect) - font._lineHeight) + "px";
             break;
 
         default:
-            var topPoint = _CGRectGetMinY(contentRect) + "px";
+            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px";
             break;
     }
 
     element.style.top = topPoint;
-    var left = _CGRectGetMinX(contentRect);
-
-    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
-    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
-        left -= 1;
-
-    element.style.left = left + "px";
+    element.style.left = (_CGRectGetMinX(contentRect) - 1) + "px"; // why -1?
     element.style.width = _CGRectGetWidth(contentRect) + "px";
-    element.style.height = ROUND(lineHeight) + "px";
-    element.style.lineHeight = ROUND(lineHeight) + "px";
-    element.style.verticalAlign = "top";
-    element.style.cursor = "auto";
+    element.style.height = font._lineHeight + "px"; // private ivar for the line height of the DOM text at this particular size
 
     _DOMElement.appendChild(element);
 
-    // The font change above doesn't work for some browsers if the element isn't already appendChild'ed.
-    if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
-        element.style.font = [font cssString];
+    window.setTimeout(function()
+    {
+        element.focus();
+
+        // Select the text if the textfield became first responder through keyboard interaction
+        if (!_willBecomeFirstResponderByClick)
+            [self selectText:self];
+
+        _willBecomeFirstResponderByClick = NO;
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+        CPTextFieldInputOwner = self;
+    }, 0.0);
+
+    element.value = [self stringValue];
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
@@ -622,94 +562,34 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
         [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
     }
-
-    CPTextFieldInputOwner = self;
-
-    window.setTimeout(function()
-    {
-        /*
-            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
-        */
-        if (CPTextFieldInputOwner !== self)
-            return;
-
-        element.focus();
-
-        // Select the text if the textfield became first responder through keyboard interaction
-        if (!_willBecomeFirstResponderByClick)
-            [self _selectText:self immediately:YES];
-
-        _willBecomeFirstResponderByClick = NO;
-
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-    }, 0.0);
-
 #endif
+
+    return YES;
 }
 
 /* @ignore */
 - (BOOL)resignFirstResponder
-{
-#if PLATFORM(DOM)
-
-    var element = [self _inputElement],
-        newValue = element.value,
-        error = @"";
-
-    if (newValue !== _stringValue)
-    {
-        [self _setStringValue:newValue];
-    }
-
-    // If there is a formatter, always give it a chance to reject the resignation,
-    // even if the value has not changed.
-    if ([self _valueIsValid:newValue] === NO)
-    {
-        element.focus();
-        return NO;
-    }
-
-#endif
-
-    // When we are no longer the first responder we don't worry about the key status of our window anymore.
-    [self _setObserveWindowKeyNotifications:NO];
-
-    [self _resignFirstKeyResponder];
-
-    _isEditing = NO;
-    [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-
-    if ([self sendsActionOnEndEditing])
-        [self sendAction:[self action] to:[self target]];
-
-    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
-
-    return YES;
-}
-
-- (void)_resignFirstKeyResponder
 {
     [self unsetThemeState:CPThemeStateEditing];
 
-    // Cache the formatted string
-    _stringValue = [self stringValue];
-
-    _willBecomeFirstResponderByClick = NO;
-
     [self _updatePlaceholderState];
+
     [self setNeedsLayout];
 
 #if PLATFORM(DOM)
 
     var element = [self _inputElement];
 
+    if ([self stringValue] !== element.value)
+        [self _setStringValue:element.value];
+
     CPTextFieldInputResigning = YES;
 
     if (CPTextFieldInputIsActive)
         element.blur();
 
     if (!CPTextFieldInputDidBlur)
-        CPTextFieldBlurHandler();
+        CPTextFieldBlurFunction();
 
     CPTextFieldInputDidBlur = NO;
     CPTextFieldInputResigning = NO;
@@ -729,52 +609,18 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
 
 #endif
-}
 
-- (void)_setObserveWindowKeyNotifications:(BOOL)shouldObserve
-{
-    if (shouldObserve)
+    //post CPControlTextDidEndEditingNotification
+    if (_isEditing)
     {
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:) name:CPWindowDidResignKeyNotification object:[self window]];
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidBecomeKey:) name:CPWindowDidBecomeKeyNotification object:[self window]];
-    }
-    else
-    {
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
-    }
-}
+        _isEditing = NO;
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
 
-- (void)_windowDidResignKey:(CPNotification)aNotification
-{
-    if (![[self window] isKeyWindow])
-        [self _resignFirstKeyResponder];
-}
-
-- (void)_windowDidBecomeKey:(CPNotification)aNotification
-{
-    if ([[self window] isKeyWindow] && [[self window] firstResponder] === self)
-        [self _becomeFirstKeyResponder];
-}
-
-- (BOOL)_valueIsValid:(CPString)aValue
-{
-#if PLATFORM(DOM)
-
-    var error = @"";
-
-    if ([self _setStringValue:aValue isNewValue:NO errorDescription:AT_REF(error)] === NO)
-    {
-        var acceptInvalidValue = NO;
-
-        if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
-            acceptInvalidValue = [_delegate control:self didFailToFormatString:aValue errorDescription:error];
-
-        if (acceptInvalidValue === NO)
-            return NO;
+        if ([self sendsActionOnEndEditing])
+            [self sendAction:[self action] to:[self target]];
     }
 
-#endif
+    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
 
     return YES;
 }
@@ -839,14 +685,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)keyUp:(CPEvent)anEvent
 {
-#if PLATFORM(DOM)
+    var oldValue = [self stringValue];
+    [self _setStringValue:[self _inputElement].value];
 
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
-        [self _setStringValue:newValue];
-
         if (!_isEditing)
         {
             _isEditing = YES;
@@ -856,13 +699,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
 
-#endif
-
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)keyDown:(CPEvent)anEvent
 {
+    if ([anEvent _couldBeKeyEquivalent] && [self performKeyEquivalent:anEvent])
+        return;
+
     // CPTextField uses an HTML input element to take the input so we need to
     // propagate the dom event so the element is updated. This has to be done
     // before interpretKeyEvents: though so individual commands have a chance
@@ -891,60 +735,26 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)insertNewline:(id)sender
 {
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
+    if (_isEditing)
     {
-        [self _setStringValue:newValue];
+        _isEditing = NO;
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
     }
 
-    if ([self _valueIsValid:_stringValue])
-    {
-        // If _isEditing == YES then the target action can also be called via
-        // resignFirstResponder, and it is possible that the target action
-        // itself will change this textfield's responder status, so start by
-        // setting the _isEditing flag to NO to prevent the target action being
-        // called twice (once below and once from resignFirstResponder).
-        if (_isEditing)
-        {
-            _isEditing = NO;
-            [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-        }
-
-        // If there is no target action, or the sendAction call returns
-        // success.
-        if (![self action] || [self sendAction:[self action] to:[self target]])
-        {
-            [self selectAll:nil];
-        }
-    }
+    [self sendAction:[self action] to:[self target]];
+    [self selectText:nil];
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
 }
 
 - (void)insertNewlineIgnoringFieldEditor:(id)sender
 {
-    [self _insertCharacterIgnoringFieldEditor:CPNewlineCharacter];
-}
+    var oldValue = [self stringValue];
 
-- (void)insertTabIgnoringFieldEditor:(id)sender
-{
-    [self _insertCharacterIgnoringFieldEditor:CPTabCharacter];
-}
+    [self _inputElement].value += CPNewlineCharacter;
+    [self _setStringValue:[self _inputElement].value];
 
-- (void)_insertCharacterIgnoringFieldEditor:(CPString)aCharacter
-{
-#if PLATFORM(DOM)
-
-    var oldValue = _stringValue,
-        range = [self selectedRange],
-        element = [self _inputElement];
-
-    element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
-    [self _setStringValue:element.value];
-
-    // NOTE: _stringValue is now the current input element value
-    if (oldValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
         if (!_isEditing)
         {
@@ -954,8 +764,25 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
+}
 
-#endif
+- (void)insertTabIgnoringFieldEditor:(id)sender
+{
+    var oldValue = [self stringValue];
+
+    [self _inputElement].value += CPTabCharacter;
+    [self _setStringValue:[self _inputElement].value];
+
+    if (oldValue !== [self stringValue])
+    {
+        if (!_isEditing)
+        {
+            _isEditing = YES;
+            [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+        }
+
+        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+    }
 }
 
 - (void)textDidBlur:(CPNotification)note
@@ -986,8 +813,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [super textDidChange:note];
 }
 
+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [self _reverseSetBinding];
+
+    [CPApp sendAction:anAction to:anObject from:self];
+}
+
 /*!
-    Returns the string in the text field.
+    Returns the string the text field.
 */
 - (id)objectValue
 {
@@ -996,84 +830,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*
     @ignore
-    Sets the internal string value without updating the value in the input element.
-    This should only be invoked when the underlying text element's value has changed.
+    Sets the internal string value without updating the value in the input element
 */
-- (BOOL)_setStringValue:(CPString)aValue
+- (void)_setStringValue:(id)aValue
 {
-    return [self _setStringValue:aValue isNewValue:YES errorDescription:nil];
-}
-
-/*
-    @ignore
-    Sets the internal string value without updating the value in the input element.
-    If there is a formatter and formatting fails, returns NO. Otherwise returns YES.
-*/
-- (BOOL)_setStringValue:(CPString)aValue isNewValue:(BOOL)isNewValue errorDescription:(CPStringRef)anError
-{
-    _stringValue = aValue;
-
-    var objectValue = aValue,
-        formatter = [self formatter],
-        result = YES;
-
-    if (formatter)
-    {
-        var object = nil;
-
-        if ([formatter getObjectValue:AT_REF(object) forString:aValue errorDescription:anError])
-            objectValue = object;
-        else
-        {
-            objectValue = undefined;  // Mark the value as invalid
-            result = NO;
-        }
-
-        isNewValue |= objectValue !== [super objectValue];
-    }
-
-    if (isNewValue)
-    {
-        [self willChangeValueForKey:@"objectValue"];
-        [super setObjectValue:objectValue];
-        [self _updatePlaceholderState];
-        [self didChangeValueForKey:@"objectValue"];
-    }
-
-    return result;
+    [self willChangeValueForKey:@"objectValue"];
+    [super setObjectValue:String(aValue)];
+    [self _updatePlaceholderState];
+    [self didChangeValueForKey:@"objectValue"];
 }
 
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
 
-    var formatter = [self formatter];
-
-    if (formatter)
-    {
-        // If there is a formatter, make sure the object value can be formatted successfully
-        var formattedString = [self hasThemeState:CPThemeStateEditing] ? [formatter editingStringForObjectValue:aValue] : [formatter stringForObjectValue:aValue];
-
-        if (formattedString === nil)
-        {
-            var value = nil;
-
-            // Formatting failed, get an "empty" object by formatting an empty string.
-            // If that fails, the value is undefined.
-            if ([formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;
-
-            [super setObjectValue:value];
-        }
-    }
-
-    _stringValue = [self stringValue];
-
 #if PLATFORM(DOM)
 
     if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
-        [self _inputElement].value = _stringValue;
-
+        [self _inputElement].value = aValue;
 #endif
 
     [self _updatePlaceholderState];
@@ -1081,7 +855,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)_updatePlaceholderState
 {
-    if ((!_stringValue || _stringValue.length === 0) && ![self hasThemeState:CPThemeStateEditing])
+    var string = [self stringValue];
+
+    if ((!string || string.length === 0) && ![self hasThemeState:CPThemeStateEditing])
         [self setThemeState:CPTextFieldStatePlaceholder];
     else
         [self unsetThemeState:CPTextFieldStatePlaceholder];
@@ -1134,6 +910,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     However, since you don't know how tall it needs to be if you change the font, sizeToFit will still be
     useful for making the textfield an appropriate height.
 */
+
 - (void)sizeToFit
 {
     [self setFrameSize:[self _minimumFrameSize]];
@@ -1146,7 +923,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         minSize = [self currentValueForThemeAttribute:@"min-size"],
         maxSize = [self currentValueForThemeAttribute:@"max-size"],
         lineBreakMode = [self lineBreakMode],
-        text = (_stringValue || @" "),
+        text = ([self stringValue] || @" "),
         textSize = _CGSizeMakeCopy(frameSize),
         font = [self currentValueForThemeAttribute:@"font"];
 
@@ -1160,16 +937,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         textSize = [text sizeWithFont:font inWidth:textSize.width];
     }
     else
-    {
         textSize = [text sizeWithFont:font];
 
-        // Account for possible fractional pixels at right edge
-        textSize.width += 1;
-    }
-
-    // Account for possible fractional pixels at bottom edge
-    textSize.height += 1;
-
     frameSize.height = textSize.height + contentInset.top + contentInset.bottom;
 
     if ([self isBezeled])
@@ -1195,36 +964,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 */
 - (void)selectText:(id)sender
 {
-    [self _selectText:sender immediately:NO];
-}
+    // FIXME Should this really make the text field the first responder?
 
-- (void)_selectText:(id)sender immediately:(BOOL)immediately
-{
-    // Selecting the text in a field makes it the first responder
     if (([self isEditable] || [self isSelectable]))
     {
-        var wind = [self window];
-
 #if PLATFORM(DOM)
         var element = [self _inputElement];
 
-        if ([wind firstResponder] === self)
-        {
-            if (immediately)
-                element.select();
-            else
-                window.setTimeout(function() { element.select(); }, 0);
-        }
-        else if (wind !== nil && [wind makeFirstResponder:self])
-            [self _selectText:sender immediately:immediately];
+        if ([[self window] firstResponder] === self)
+            window.setTimeout(function() { element.select(); }, 0);
+        else if ([self window] !== nil && [[self window] makeFirstResponder:self])
+            window.setTimeout(function() {[self selectText:sender];}, 0);
 #else
         // Even if we can't actually select the text we need to preserve the first
         // responder side effect.
-        if (wind !== nil && [wind firstResponder] !== self)
-            [wind makeFirstResponder:self];
+        if ([self window] !== nil && [[self window] firstResponder] !== self)
+            [[self window] makeFirstResponder:self];
 #endif
     }
-
 }
 
 - (void)copy:(id)sender
@@ -1237,7 +994,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             return;
 
         var pasteboard = [CPPasteboard generalPasteboard],
-            stringForPasting = [_stringValue substringWithRange:selectedRange];
+            stringValue = [self stringValue],
+            stringForPasting = [stringValue substringWithRange:selectedRange];
 
         [pasteboard declareTypes:[CPStringPboardType] owner:nil];
         [pasteboard setString:stringForPasting forType:CPStringPboardType];
@@ -1251,8 +1009,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self copy:sender];
         [self deleteBackward:sender];
     }
-    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
-    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
+    else
         [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }
 
@@ -1268,14 +1025,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self deleteBackward:sender];
 
         var selectedRange = [self selectedRange],
+            stringValue = [self stringValue],
             pasteString = [pasteboard stringForType:CPStringPboardType],
-            newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
 
         [self setStringValue:newValue];
         [self setSelectedRange:CPMakeRange(selectedRange.location + pasteString.length, 0)];
     }
-    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
-    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
+    else
         [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }
 
@@ -1284,8 +1041,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if ([[self window] firstResponder] !== self)
         return CPMakeRange(0, 0);
 
-#if PLATFORM(DOM)
-
     // we wrap this in try catch because firefox will throw an exception in certain instances
     try
     {
@@ -1312,8 +1067,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         // fall through to the return
     }
 
-#endif
-
     return CPMakeRange(0, 0);
 }
 
@@ -1322,8 +1075,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (![[self window] firstResponder] === self)
         return;
 
-#if PLATFORM(DOM)
-
     var inputElement = [self _inputElement];
 
     try
@@ -1352,8 +1103,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     catch (e)
     {
     }
-
-#endif
 }
 
 - (void)selectAll:(id)sender
@@ -1371,7 +1120,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     selectedRange.location += 1;
     selectedRange.length -= 1;
 
-    var newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
+    var stringValue = [self stringValue],
+        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
 
     [self setStringValue:newValue];
     [self setSelectedRange:CPMakeRange(selectedRange.location, 0)];
@@ -1441,14 +1191,30 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return _CGRectInsetByInset(bounds, contentInset);
+    if (!contentInset)
+        return bounds;
+
+    bounds.origin.x += contentInset.left;
+    bounds.origin.y += contentInset.top;
+    bounds.size.width -= contentInset.left + contentInset.right;
+    bounds.size.height -= contentInset.top + contentInset.bottom;
+
+    return bounds;
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return _CGRectInsetByInset(bounds, bezelInset);
+    if (_CGInsetIsEmpty(bezelInset))
+        return bounds;
+
+    bounds.origin.x += bezelInset.left;
+    bounds.origin.y += bezelInset.top;
+    bounds.size.width -= bezelInset.left + bezelInset.right;
+    bounds.size.height -= bezelInset.top + bezelInset.bottom;
+
+    return bounds;
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -1475,6 +1241,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     else
     {
         var view = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+        //[view setImagePosition:CPNoImage];
 
         [view setHitTests:NO];
 
@@ -1507,7 +1274,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             string = [self placeholderString];
         else
         {
-            string = _stringValue;
+            string = [self stringValue];
 
             if ([self isSecure])
                 string = secureStringForString(string);
@@ -1550,7 +1317,7 @@ var secureStringForString = function(aString)
         return "";
 
     return Array(aString.length + 1).join(CPSecureTextFieldCharacter);
-};
+}
 
 
 var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
@@ -1620,25 +1387,47 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 {
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+- (void)setValueFor:(CPString)theBinding
 {
-    [super _updatePlaceholdersWithOptions:options];
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
 
-    [self _setPlaceholder:@"Multiple Values" forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:@"No Selection" forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:@"Not Applicable" forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:@"" forMarker:CPNullMarker isDefault:YES];
-}
+    if (isPlaceholder)
+    {
+        switch (newValue)
+        {
+            case CPMultipleValuesMarker:
+                newValue = [options objectForKey:CPMultipleValuesPlaceholderBindingOption] || @"Multiple Values";
+                break;
 
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setPlaceholderString:aValue];
-    [_source setObjectValue:nil];
-}
+            case CPNoSelectionMarker:
+                newValue = [options objectForKey:CPNoSelectionPlaceholderBindingOption] || @"No Selection";
+                break;
 
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setObjectValue:aValue];
+            case CPNotApplicableMarker:
+                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+                    [CPException raise:CPGenericException
+                                reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
+
+                newValue = [options objectForKey:CPNotApplicablePlaceholderBindingOption] || @"Not Applicable";
+                break;
+
+            case CPNullMarker:
+                newValue = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
+                break;
+        }
+
+        [_source setPlaceholderString:newValue];
+        [_source setObjectValue:nil];
+    }
+    else
+    {
+        newValue = [self transformValue:newValue withOptions:options];
+        [_source setObjectValue:newValue];
+    }
 }
 
 @end

AppKit/CPTheme.j

@@ -255,7 +255,7 @@ var CPThemesByName          = { },
         attributeNames = [attributes keyEnumerator],
         objectThemeClass = [anObject themeClass];
 
-    while ((attributeName = [attributeNames nextObject]) !== nil)
+    while (attributeName = [attributeNames nextObject])
         [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }
 
@@ -418,9 +418,6 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
-CPThemeStateAutocompleting  = CPThemeState("autocompleting");
-CPThemeStateMainWindow      = CPThemeState("mainWindow");
-CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 
 @implementation _CPThemeAttribute : CPObject
 {
@@ -582,7 +579,6 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
         _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
@@ -615,7 +611,6 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_name forKey:@"name"];
-    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
         count = keys.length;
@@ -671,7 +666,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-};
+}
 
 numberOfOnes.displayName = "numberOfOnes";
 

AppKit/CPToolbar.j

@@ -50,11 +50,6 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
-CPToolbarSizeModeDefault                = 0;
-CPToolbarSizeModeRegular                = 1;
-CPToolbarSizeModeSmall                  = 2;
-
 var CPToolbarsByIdentifier              = nil,
     CPToolbarConfigurationsByIdentifier = nil;
 
@@ -88,12 +83,10 @@ var CPToolbarsByIdentifier              = nil,
 @implementation CPToolbar : CPObject
 {
     CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
+    CPToolbarDisplayMode    _displayMode;
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    int                     _sizeMode @accessors(property=sizeMode);
-    int                     _desiredHeight;
 
     id                      _delegate;
 
@@ -114,7 +107,7 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 + (void)initialize
 {
-    if (self !== [CPToolbar class])
+    if (self != [CPToolbar class])
         return;
 
     CPToolbarsByIdentifier = [CPDictionary dictionary];
@@ -135,19 +128,6 @@ var CPToolbarsByIdentifier              = nil,
     [toolbarsSharingIdentifier addObject:toolbar];
 }
 
-/*
-    Temporary theme attributes until we've figured out which CPView these theme attributes should
-    belong to.
-    @ignore
-*/
-+ (id)_themeAttributes
-{
-    // "regular-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeRegular.
-    // "small-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeSmall.
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMake(4.0, 4.0, 4.0, TOOLBAR_ITEM_MARGIN), 59.0, 46.0]
-                                       forKeys:[@"content-inset", @"regular-size-height", @"small-size-height"]];
-}
-
 - (id)init
 {
     return [self initWithIdentifier:@""];
@@ -168,8 +148,6 @@ var CPToolbarsByIdentifier              = nil,
 
         _identifier = anIdentifier;
         _isVisible = YES;
-        _sizeMode = CPToolbarSizeModeDefault;
-        _desiredHeight = 0;
 
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
     }
@@ -224,16 +202,6 @@ var CPToolbarsByIdentifier              = nil,
     [_window _noteToolbarChanged];
 }
 
-- (void)setSizeMode:(CPToolbarSizeMode)aSize
-{
-    if (aSize === _sizeMode)
-        return;
-    _sizeMode = aSize;
-
-    [[self _toolbarView] setFrame:[self _toolbarViewFrame]];
-    [_window _noteToolbarChanged];
-}
-
 - (CPWindow)_window
 {
     return _window;
@@ -241,13 +209,7 @@ var CPToolbarsByIdentifier              = nil,
 
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window)
-        [[CPNotificationCenter defaultCenter] removeObserver:self object:_window];
-
     _window = aWindow;
-
-    if (_window)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autoValidateVisibleItems) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }
 
 /*!
@@ -264,43 +226,18 @@ var CPToolbarsByIdentifier              = nil,
     [self _reloadToolbarItems];
 }
 
-- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
-{
-    if (_displayMode === aDisplayMode)
-        return;
-    _displayMode = aDisplayMode;
-
-    [self _reloadToolbarItems];
-}
-
 /* @ignore */
 - (void)_loadConfiguration
 {
 
 }
 
-- (CGRect)_toolbarViewFrame
-{
-    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [self _valueForThemeAttribute:@"regular-size-height"] : [self _valueForThemeAttribute:@"small-size-height"]);
-    return CPRectMake(0.0, 0.0, 1200.0, height);
-}
-
-/*
-    Temporary theme attributes until we've figured out which CPView these theme attributes should
-    belong to.
-    @ignore
-*/
-- (id)_valueForThemeAttribute:(CPString)attributeName
-{
-    return [[[self class] _themeAttributes] valueForKey:attributeName];
-}
-
 /* @ignore */
 - (CPView)_toolbarView
 {
     if (!_toolbarView)
     {
-        _toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
 
         [_toolbarView setToolbar:self];
         [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -320,17 +257,13 @@ var CPToolbarsByIdentifier              = nil,
     // _defaultItems may have been loaded from Cib
     _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];
 
-    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    if (_delegate)
     {
-        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];
+        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
 
-        // If we get items both from the Cib and from the delegate method, put the delegate items before the
-        // Cib ones.
         if (itemIdentifiersFromDelegate)
-            _itemIdentifiers = [itemIdentifiersFromDelegate arrayByAddingObjectsFromArray:_itemIdentifiers];
+            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
     }
-    // If we didn't load from a cib and the delegate hasn't been set yet, we'll just work with an empty list
-    // at this point.
 
     var index = 0,
         count = [_itemIdentifiers count];
@@ -399,26 +332,12 @@ var CPToolbarsByIdentifier              = nil,
     each visible toolbar item.
 */
 - (void)validateVisibleItems
-{
-    [self _validateVisibleItems:NO]
-}
-
-- (void)_autoValidateVisibleItems
-{
-    [self _validateVisibleItems:YES]
-}
-
-- (void)_validateVisibleItems:(BOOL)isAutovalidation
 {
     var toolbarItems = [self visibleItems],
         count = [toolbarItems count];
 
     while (count--)
-    {
-        var item = [toolbarItems objectAtIndex:count];
-        if (!isAutovalidation || [item autovalidates])
-            [item validate];
-    }
+        [toolbarItems[count] validate];
 }
 
 /* @ignore */
@@ -508,8 +427,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
     CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
     CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
-    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
 
 @implementation CPToolbar (CPCoding)
 
@@ -528,7 +446,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
         _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
         _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
         _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
-        _sizeMode = [aCoder decodeIntForKey:CPToolbarSizeModeKey];
 
         _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
         _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
@@ -575,7 +492,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
     [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
     [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
-    [aCoder encodeInt:_sizeMode forKey:CPToolbarSizeModeKey]
 
     [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
     [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
@@ -592,13 +508,14 @@ var _CPToolbarViewBackgroundColor = nil,
     _CPToolbarViewExtraItemsImage = nil,
     _CPToolbarViewExtraItemsAlternateImage = nil;
 
-var TOOLBAR_ITEM_MARGIN         = 10.0,
+var TOOLBAR_TOP_MARGIN          = 5.0,
+    TOOLBAR_ITEM_MARGIN         = 10.0,
     TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;
 
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
-};
+}
 
 /* @ignore */
 @implementation _CPToolbarView : CPView
@@ -630,9 +547,9 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     var bundle = [CPBundle bundleForClass:self];
 
-    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size:CPSizeMake(10.0, 15.0)];
+    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
 
-    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:_CGSizeMake(10.0, 15.0)];
+    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -646,7 +563,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         _labelColor = [CPColor blackColor];
         _labelShadowColor = [CPColor colorWithWhite:1.0 alpha:0.75];
 
-        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
+        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
         [_additionalItemsButton setBordered:NO];
 
         [_additionalItemsButton setImagePosition:CPImageOnly];
@@ -698,7 +615,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     // We begin by recalculating the visible items.
     var items = [_toolbar items],
-        itemsWidth = _CGRectGetWidth([self bounds]),
+        itemsWidth = CGRectGetWidth([self bounds]),
         minWidth = _minWidth,
         // FIXME: This should be a CPSet.
         invisibleItemsSortedByPriority = [];
@@ -748,24 +665,6 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             height = minSize.height;
     }
 
-    // We'll figure out the proper height for the toolbar depending on its items.
-    // If nothing has a minimum size we'll use the standard toolbar size for the
-    // sizeMode, indicated by a 0 _desiredHeight.
-    var contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
-        newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;
-
-    if (newDesiredHeight != _toolbar._desiredHeight)
-    {
-        // FIXME Probably the toolbar view shouldn't be telling the toolbar which height it should be. Maybe refactor
-        // to just have the toolbar scan the toolbar items whenever the items change.
-        _toolbar._desiredHeight = newDesiredHeight;
-
-        [self setFrame:[_toolbar _toolbarViewFrame]];
-        [_toolbar._window _noteToolbarChanged];
-        // The above will cause tile to be called again.
-        return;
-    }
-
     // Determine all the items that have flexible width.
     // Also determine the height of the toolbar.
     var count = _visibleItems.length,
@@ -785,7 +684,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         // static width (min==max). This handles the case where the user did setView:
         // with a view of a different size than minSize/maxSize
         else
-            [view setFrameSize:_CGSizeMake(minSize.width, height)];
+            [view setFrameSize:CGSizeMake(minSize.width, height)];
 
         [view setHidden:NO];
     }
@@ -820,23 +719,21 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
                 remainingSpace += proposedWidth - constrainedWidth;
             }
 
-            [view setFrameSize:_CGSizeMake(constrainedWidth, height)];
+            [view setFrameSize:CGSizeMake(constrainedWidth, height)];
         }
     }
 
     // Now that all the visible items are the correct width, give them their final frames.
     var index = 0,
         count = _visibleItems.length,
-        x = contentInset.left,
-        contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
-        y = contentInset.top;
+        x = TOOLBAR_ITEM_MARGIN;
 
     for (; index < count; ++index)
     {
         var view = [self viewForItem:_visibleItems[index]],
-            viewWidth = _CGRectGetWidth([view frame]);
+            viewWidth = CGRectGetWidth([view frame]);
 
-        [view setFrame:_CGRectMake(x, y, viewWidth, height)];
+        [view setFrame:CGRectMake(x, 0.0, viewWidth, height)];
 
         x += viewWidth + TOOLBAR_ITEM_MARGIN;
     }
@@ -870,7 +767,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     if (needsAdditionalItemsButton)
     {
-        [_additionalItemsButton setFrameOrigin:_CGPointMake(itemsWidth + 5.0, (_CGRectGetHeight([self bounds]) - _CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
+        [_additionalItemsButton setFrameOrigin:CGPointMake(itemsWidth + 5.0, (CGRectGetHeight([self bounds]) - CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
 
         [self addSubview:_additionalItemsButton];
 
@@ -979,9 +876,10 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
         return CPOrderedAscending;
 
     return CPOrderedDescending;
-};
+}
 
-var LABEL_MARGIN    = 2.0;
+var TOP_MARGIN      = 5.0,
+    LABEL_MARGIN    = 2.0;
 
 @implementation _CPToolbarItemView : CPControl
 {
@@ -1008,12 +906,12 @@ var LABEL_MARGIN    = 2.0;
     {
         _toolbarItem = aToolbarItem;
 
-        _labelField = [[CPTextField alloc] initWithFrame:_CGRectMakeZero()];
+        _labelField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
         [_labelField setFont:[CPFont systemFontOfSize:11.0]];
         [_labelField setTextColor:[self FIXME_labelColor]];
         [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
-        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
         [_labelField setAutoresizingMask:CPViewWidthSizable | CPViewMinXMargin];
 
         [self addSubview:_labelField];
@@ -1060,11 +958,11 @@ var LABEL_MARGIN    = 2.0;
 
         if (identifier === CPToolbarSeparatorItemIdentifier)
         {
-            _view = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, 2.0, 32.0)];
+            _view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
 
             // FIXME: Get rid of this old API!!!
             sizes = {};
-            sizes[@"CPToolbarItemSeparator"] = [_CGSizeMake(2.0, 26.0), _CGSizeMake(2.0, 1.0), _CGSizeMake(2.0, 26.0)];
+            sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
             [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
 
             [self addSubview:_view];
@@ -1098,7 +996,7 @@ var LABEL_MARGIN    = 2.0;
         {
             _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];
 
-            [_imageView setImageScaling:CPImageScaleProportionallyDown];
+            [_imageView setImageScaling:CPScaleProportionally];
 
             [self addSubview:_imageView];
         }
@@ -1116,13 +1014,8 @@ var LABEL_MARGIN    = 2.0;
 
     _labelSize = [_labelField frame].size;
 
-    var iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
-        labelOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeLabelOnly;
-    [_labelField setHidden:iconOnly];
-    [_view setHidden:labelOnly];
-
-    _minSize = _CGSizeMake(MAX(_labelSize.width, minSize.width), (labelOnly ? 0 : minSize.height) + (iconOnly ? 0 : _labelSize.height + LABEL_MARGIN));
-    _maxSize = _CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);
+    _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
+    _maxSize = CGSizeMake(MIN(_labelSize.width, maxSize.width), 100000000.0);
 
     [_toolbar tile];
 }
@@ -1139,23 +1032,20 @@ var LABEL_MARGIN    = 2.0;
         width = _CGRectGetWidth(bounds);
 
     if (identifier === CPToolbarSeparatorItemIdentifier)
-        return [_view setFrame:_CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
+        return [_view setFrame:CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
 
-    // The view is centred in the available space above the label.
     var view = _view || _imageView,
         itemMaxSize = [_toolbarItem maxSize],
-        iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
-        height = _CGRectGetHeight(bounds) - (iconOnly ? 0 : _labelSize.height),
+        height = _CGRectGetHeight(bounds) - _labelSize.height - LABEL_MARGIN - TOP_MARGIN,
         viewWidth = MIN(itemMaxSize.width, width),
         viewHeight =  MIN(itemMaxSize.height, height);
 
-    [view setFrame:_CGRectMake(ROUND((width - viewWidth) / 2.0),
-                               ROUND((height - viewHeight) / 2.0),
-                               viewWidth,
-                               viewHeight)];
+    [view setFrame:CGRectMake(  ROUND((width - viewWidth) / 2.0),
+                                TOP_MARGIN + ROUND((height - viewHeight) / 2.0),
+                                viewWidth,
+                                viewHeight)];
 
-    // Label is always drawn at the bottom of the view. So if the view is really tall but the icon is tiny, the icon is centred above the label while the label remains on the bottom.
-    [_labelField setFrameOrigin:_CGPointMake(ROUND((width - _labelSize.width) / 2.0), _CGRectGetHeight(bounds) - _labelSize.height)];
+    [_labelField setFrameOrigin:CGPointMake(ROUND((width - _labelSize.width) / 2.0), TOP_MARGIN + height + LABEL_MARGIN)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -1175,10 +1065,6 @@ var LABEL_MARGIN    = 2.0;
 
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
-    // Tiling is very expensive so try to avoid it. The CPToolbarItem should already be careful to not notifying about its enabled state needlessly.
-    if ([self isEnabled] === shouldBeEnabled)
-        return;
-
     [super setEnabled:shouldBeEnabled];
 
     if (shouldBeEnabled)
@@ -1222,7 +1108,7 @@ var LABEL_MARGIN    = 2.0;
         if (alternateImage)
             [_imageView setImage:alternateImage];
 
-        [_labelField setTextShadowOffset:_CGSizeMakeZero()];
+        [_labelField setTextShadowOffset:CGSizeMakeZero()];
     }
     else
     {
@@ -1231,7 +1117,7 @@ var LABEL_MARGIN    = 2.0;
         if (image)
             [_imageView setImage:image];
 
-        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
     }
 
     [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];

AppKit/CPToolbarItem.j

@@ -275,9 +275,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
-    if (_isEnabled === shouldBeEnabled)
-        return;
-
     if ([_view respondsToSelector:@selector(setEnabled:)])
         [_view setEnabled:shouldBeEnabled];
 
@@ -460,49 +457,26 @@ CPToolbarItemVisibilityPriorityUser
     if (_view)
     {
         if ([target respondsToSelector:@selector(validateToolbarItem:)])
-        {
-            var shouldBeEnabled = [target validateToolbarItem:self];
-            if (_isEnabled !== shouldBeEnabled)
-                [self setEnabled:shouldBeEnabled];
-        }
+            [self setEnabled:[target validateToolbarItem:self]];
 
         return;
     }
 
     if (!action)
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
+        return [self setEnabled:NO];
 
     if (target && ![target respondsToSelector:action])
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
+        return [self setEnabled:NO];
 
     target = [CPApp targetForAction:action to:target from:self];
 
     if (!target)
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
+        return [self setEnabled:NO];
 
     if ([target respondsToSelector:@selector(validateToolbarItem:)])
-    {
-        var shouldBeEnabled = [target validateToolbarItem:self];
-        if (_isEnabled !== shouldBeEnabled)
-            [self setEnabled:shouldBeEnabled];
-    }
+        [self setEnabled:[target validateToolbarItem:self]];
     else
-    {
-        if (!_isEnabled)
-            [self setEnabled:YES];
-    }
+        [self setEnabled:YES];
 }
 
 - (BOOL)autovalidates

AppKit/CPTreeNode.j

@@ -1,24 +1,3 @@
-/*
- * CPTreeNode.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPIndexPath.j>

AppKit/CPUserDefaultsController.j

@@ -180,7 +180,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
     var keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [self willChangeValueForKey:key];
@@ -194,7 +194,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
     var keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [[_controller defaults] setObject:[_cachedValues objectForKey:key] forKey:key];
@@ -207,7 +207,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [self willChangeValueForKey:key];
@@ -229,7 +229,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount],
             value = [_cachedValues objectForKey:key],
@@ -250,7 +250,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount],
             value = [_cachedValues objectForKey:key],

AppKit/CPView.j

@@ -21,14 +21,14 @@
  */
 
 @import <Foundation/CPArray.j>
-@import <Foundation/CPGeometry.j>
 @import <Foundation/CPObjJRuntime.j>
 @import <Foundation/CPSet.j>
 
 @import "CGAffineTransform.j"
-
+@import "CGGeometry.j"
 
 @import "CPColor.j"
+@import "CPGeometry.j"
 @import "CPGraphicsContext.j"
 @import "CPResponder.j"
 @import "CPTheme.j"
@@ -98,7 +98,6 @@ var CPViewFlags                     = { },
     CPViewHasCustomDrawRect         = 1 << 0,
     CPViewHasCustomLayoutSubviews   = 1 << 1;
 
-
 /*!
     @ingroup appkit
     @class CPView
@@ -142,7 +141,6 @@ var CPViewFlags                     = { },
     BOOL                _postsFrameChangedNotifications;
     BOOL                _postsBoundsChangedNotifications;
     BOOL                _inhibitFrameAndBoundsChangedNotifications;
-    BOOL                _inLiveResize;
 
 #if PLATFORM(DOM)
     DOMElement          _DOMElement;
@@ -190,10 +188,7 @@ var CPViewFlags                     = { },
     unsigned            _viewClassFlags;
 
     // ToolTips
-    CPString            _toolTip    @accessors(getter=toolTip);
-    Function            _toolTipFunctionIn;
-    Function            _toolTipFunctionOut;
-    BOOL                _toolTipInstalled;
+    CPString            _toolTip    @accessors(property=toolTip);
 }
 
 /*
@@ -219,7 +214,7 @@ var CPViewFlags                     = { },
     CachedNotificationCenter = [CPNotificationCenter defaultCenter];
 }
 
-- (void)_setupViewFlags
+- (void)setupViewFlags
 {
     var theClass = [self class],
         classUID = [theClass UID];
@@ -240,13 +235,6 @@ var CPViewFlags                     = { },
     _viewClassFlags = CPViewFlags[classUID];
 }
 
-- (void)_setupToolTipHandlers
-{
-    _toolTipInstalled = NO;
-    _toolTipFunctionIn = function(e) { [_CPToolTip scheduleToolTipForView:self]; }
-    _toolTipFunctionOut = function(e) { [_CPToolTip invalidateCurrentToolTipIfNeeded]; };
-}
-
 + (CPSet)keyPathsForValuesAffectingFrame
 {
     return [CPSet setWithObjects:@"frameOrigin", @"frameSize"];
@@ -303,9 +291,6 @@ var CPViewFlags                     = { },
         CPDOMDisplayServerSetStyleLeftTop(_DOMElement, NULL, _CGRectGetMinX(aFrame), _CGRectGetMinY(aFrame));
         CPDOMDisplayServerSetStyleSize(_DOMElement, width, height);
 
-        if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
-            _DOMElement.setAttribute("data-cappuccino-view", [self className]);
-
         _DOMImageParts = [];
         _DOMImageSizes = [];
 #endif
@@ -313,8 +298,7 @@ var CPViewFlags                     = { },
         _theme = [CPTheme defaultTheme];
         _themeState = CPThemeStateNormal;
 
-        [self _setupToolTipHandlers];
-        [self _setupViewFlags];
+        [self setupViewFlags];
 
         [self _loadThemeAttributes];
     }
@@ -322,82 +306,6 @@ var CPViewFlags                     = { },
     return self;
 }
 
-
-/*!
-    Sets the tooltip for the receiver.
-
-    @param aToolTip the tooltip
-*/
-- (void)setToolTip:(CPString)aToolTip
-{
-    if (_toolTip == aToolTip)
-        return;
-
-    if (aToolTip && ![aToolTip isKindOfClass:CPString])
-        aToolTip = [aToolTip description];
-
-    _toolTip = aToolTip;
-
-    if (_toolTip)
-        [self _installToolTipEventHandlers];
-    else
-        [self _uninstallToolTipEventHandlers];
-}
-
-/*! @ignore
-
-    Install the handlers for the tooltip
-*/
-- (void)_installToolTipEventHandlers
-{
-    if (_toolTipInstalled)
-        return;
-
-#if PLATFORM(DOM)
-    if (_DOMElement.addEventListener)
-    {
-        _DOMElement.addEventListener("mouseover", _toolTipFunctionIn, NO);
-        _DOMElement.addEventListener("keypress", _toolTipFunctionOut, NO);
-        _DOMElement.addEventListener("mouseout", _toolTipFunctionOut, NO);
-    }
-    else if (_DOMElement.attachEvent)
-    {
-        _DOMElement.attachEvent("onmouseover", _toolTipFunctionIn);
-        _DOMElement.attachEvent("onkeypress", _toolTipFunctionOut);
-        _DOMElement.attachEvent("onmouseout", _toolTipFunctionOut);
-    }
-#endif
-
-    _toolTipInstalled = YES;
-}
-
-/*! @ignore
-
-    Uninstall the handlers for the tooltip
-*/
-- (void)_uninstallToolTipEventHandlers
-{
-    if (!_toolTipInstalled)
-        return;
-
-#if PLATFORM(DOM)
-    if (_DOMElement.removeEventListener)
-    {
-        _DOMElement.removeEventListener("mouseover", _toolTipFunctionIn, NO);
-        _DOMElement.removeEventListener("keypress", _toolTipFunctionOut, NO);
-        _DOMElement.removeEventListener("mouseout", _toolTipFunctionOut, NO);
-    }
-    else if (_DOMElement.detachEvent)
-    {
-        _DOMElement.detachEvent("onmouseover", _toolTipFunctionIn);
-        _DOMElement.detachEvent("onkeypress", _toolTipFunctionOut);
-        _DOMElement.detachEvent("onmouseout", _toolTipFunctionOut);
-    }
-#endif
-
-    _toolTipInstalled = NO;
-}
-
 /*!
     Returns the container view of the receiver
     @return the receiver's containing view
@@ -457,13 +365,10 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_insertSubview:(CPView)aSubview atIndex:(int)anIndex
 {
-    if (aSubview === self)
-        [CPException raise:CPInvalidArgumentException reason:"can't add a view as a subview of itself"];
-
     // We will have to adjust the z-index of all views starting at this index.
     var count = _subviews.length;
 
-    // Dirty the key view loop, in case the window wants to auto recalculate it
+    // dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     // If this is already one of our subviews, remove it.
@@ -544,7 +449,7 @@ var CPViewFlags                     = { },
     if (!_superview)
         return;
 
-    // Dirty the key view loop, in case the window wants to auto recalculate it
+    // dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     [_superview willRemoveSubview:self];
@@ -566,7 +471,7 @@ var CPViewFlags                     = { },
 */
 - (void)replaceSubview:(CPView)aSubview with:(CPView)aView
 {
-    if (aSubview._superview !== self)
+    if (aSubview._superview != self)
         return;
 
     var index = [_subviews indexOfObjectIdenticalTo:aSubview];
@@ -622,7 +527,7 @@ var CPViewFlags                     = { },
     var addedSubview = nil,
         addedSubviewEnumerator = [addedSubviews objectEnumerator];
 
-    while ((addedSubview = [addedSubviewEnumerator nextObject]) !== nil)
+    while (addedSubview = [addedSubviewEnumerator nextObject])
         [self addSubview:addedSubview];
 
     // If the order is fine, no need to reorder.
@@ -730,7 +635,7 @@ var CPViewFlags                     = { },
 }
 
 /*!
-    Called when the receiver is about to remove one of its subviews.
+    Called when the receiver is about to be remove one of its subviews.
     @param aView the view that will be removed
 */
 - (void)willRemoveSubview:(CPView)aView
@@ -801,7 +706,7 @@ var CPViewFlags                     = { },
 
 /*!
     Sets the frame size of the receiver to the dimensions and origin of the provided rectangle in the coordinate system
-    of the superview. The method also posts a CPViewFrameDidChangeNotification to the notification
+    of the superview. The method also posts an CPViewFrameDidChangeNotification to the notification
     center if the receiver is configured to do so. If the frame is the same as the current frame, the method simply
     returns (and no notification is posted).
     @param aFrame the rectangle specifying the new origin and size  of the receiver
@@ -854,7 +759,7 @@ var CPViewFlags                     = { },
 }
 
 /*!
-    Returns the center of the receiver's frame in the superview's coordinate system.
+    Returns the center of the receiver's frame to the provided point. The point is defined in the superview's coordinate system.
     @return CGPoint the center point of the receiver's frame
 */
 - (CGPoint)center
@@ -939,90 +844,26 @@ var CPViewFlags                     = { },
         }
         else
         {
-            var images = [[_backgroundColor patternImage] imageSlices],
-                partIndex = 0;
+            var images = [[_backgroundColor patternImage] imageSlices];
 
             if (_backgroundType === BackgroundVerticalThreePartImage)
             {
-                var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
-                    bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;
-
-                // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
-                if (top)
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, top);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[1])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, size.height - top - bottom);
-                    partIndex++;
-                }
-                if (bottom)
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, bottom);
-                }
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
             }
             else if (_backgroundType === BackgroundHorizontalThreePartImage)
             {
-                var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
-                    right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;
-
-                // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
-                if (left)
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], left, size.height);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[1])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width - left - right, size.height);
-                    partIndex++;
-                }
-                if (right)
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], right, size.height);
-                }
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
             }
             else if (_backgroundType === BackgroundNinePartImage)
             {
-                var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
-                    right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
-                    top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
-                    bottom = _DOMImageSizes[6] ? _DOMImageSizes[6].height : 0,
-                    width = size.width - left - right,
-                    height = size.height - top - bottom;
+                var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
+                    height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
 
-                if (_DOMImageSizes[0])
-                    partIndex++;
-                if (_DOMImageSizes[1])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, top);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[2])
-                    partIndex++;
-                if (_DOMImageSizes[3])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[3].width, height);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[4])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, height);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[5])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[5].width, height);
-                    partIndex++;
-                }
-                if (_DOMImageSizes[6])
-                    partIndex++;
-                if (_DOMImageSizes[7])
-                {
-                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[7].height);
-                }
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
             }
         }
     }
@@ -1518,7 +1359,7 @@ var CPViewFlags                     = { },
 */
 - (CPView)hitTest:(CPPoint)aPoint
 {
-    if (_isHidden || !_hitTests || !_CGRectContainsPoint(_frame, aPoint))
+    if (_isHidden || !_hitTests || !CPRectContainsPoint(_frame, aPoint))
         return nil;
 
     var view = nil,
@@ -1594,18 +1435,17 @@ var CPViewFlags                     = { },
         colorHasAlpha = colorExists && [_backgroundColor alphaComponent] < 1.0,
         supportsRGBA = CPFeatureIsCompatible(CPCSSRGBAFeature),
         colorNeedsDOMElement = colorHasAlpha && !supportsRGBA,
-        amount = 0,
-        slices;
+        amount = 0;
 
     if ([patternImage isThreePartImage])
     {
         _backgroundType = [patternImage isVertical] ? BackgroundVerticalThreePartImage : BackgroundHorizontalThreePartImage;
-        amount = 3;
+        amount = 3 - _DOMImageParts.length;
     }
     else if ([patternImage isNinePartImage])
     {
         _backgroundType = BackgroundNinePartImage;
-        amount = 9;
+        amount = 9 - _DOMImageParts.length;
     }
     else
     {
@@ -1613,34 +1453,6 @@ var CPViewFlags                     = { },
         amount = (colorNeedsDOMElement ? 1 : 0) - _DOMImageParts.length;
     }
 
-    // Prepare multipart image data and reduce number of required DOM parts by number of empty slices in the multipart image to save needless DOM elements.
-    if (_backgroundType === BackgroundVerticalThreePartImage || _backgroundType === BackgroundHorizontalThreePartImage || _backgroundType === BackgroundNinePartImage)
-    {
-        slices = [patternImage imageSlices];
-
-        // We won't need more divs than there are slices.
-        amount = MIN(amount, slices.length);
-
-        for (var i = 0, count = slices.length; i < count; i++)
-        {
-            var image = slices[i],
-                size = [image size];
-
-            if (!size || (size.width == 0 && size.height == 0))
-                size = nil;
-
-            _DOMImageSizes[i] = size;
-
-            // If there's a nil slice or a slice with no size, it won't need a div.
-            if (!size)
-                amount--;
-        }
-
-        // Now that we know how many divs we really need, compare that to number we actually have.
-        amount -= _DOMImageParts.length;
-    }
-
-    // Make sure the number of divs we have match our needs.
     if (amount > 0)
     {
         while (amount--)
@@ -1682,148 +1494,64 @@ var CPViewFlags                     = { },
     }
     else
     {
-        var frameSize = _frame.size,
-            partIndex = 0;
+        var slices = [patternImage imageSlices],
+            count = MIN(_DOMImageParts.length, slices.length),
+            frameSize = _frame.size;
 
-        for (var i = 0; i < slices.length; i++)
+        while (count--)
         {
-            var size = _DOMImageSizes[i];
+            var image = slices[count],
+                size = _DOMImageSizes[count] = image ? [image size] : _CGSizeMakeZero();
 
-            if (!size)
-                continue;
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[count], size.width, size.height);
 
-            var image = slices[i];
-
-            // // If image was nil, size should have been nil too.
-            // assert(image != nil);
-
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, size.height);
-
-            _DOMImageParts[partIndex].style.background = "url(\"" + [image filename] + "\")";
+            _DOMImageParts[count].style.background = image ? "url(\"" + [image filename] + "\")" : "";
 
             if (!supportsRGBA)
             {
                 if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
-                    try { _DOMImageParts[partIndex].style.removeAttribute("filter") } catch (anException) { }
+                    try { _DOMImageParts[count].style.removeAttribute("filter") } catch (anException) { }
                 else
-                    _DOMImageParts[partIndex].style.opacity = 1.0;
+                    _DOMImageParts[count].style.opacity = 1.0;
             }
-
-            partIndex++;
         }
 
         if (_backgroundType == BackgroundNinePartImage)
         {
-            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
-                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
-                top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
-                bottom = _DOMImageSizes[6] ? _DOMImageSizes[6].height : 0,
-                width = frameSize.width - left - right,
-                height = frameSize.height - top - bottom;
+            var width = frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
+                height = frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
 
-            partIndex = 0;
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
 
-            if (_DOMImageSizes[0])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                partIndex++;
-            }
-            if (_DOMImageSizes[1])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[1].height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[2])
-            {
-                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                partIndex++;
-            }
-            if (_DOMImageSizes[3])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, top);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[3].width, height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[4])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, top);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[5])
-            {
-                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, top);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[5].width, height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[6])
-            {
-                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                partIndex++;
-            }
-            if (_DOMImageSizes[7])
-            {
-                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, left, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[7].height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[8])
-            {
-                CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-            }
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
+            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[3], NULL, 0.0, _DOMImageSizes[1].height);
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[4], NULL, _DOMImageSizes[0].width, _DOMImageSizes[0].height);
+            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[5], NULL, 0.0, _DOMImageSizes[1].height);
+            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[6], NULL, 0.0, 0.0);
+            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[7], NULL, _DOMImageSizes[6].width, 0.0);
+            CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[8], NULL, 0.0, 0.0);
         }
         else if (_backgroundType == BackgroundVerticalThreePartImage)
         {
-            var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
-                bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width, frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
 
-            partIndex = 0;
-
-            // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
-            if (top)
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, top);
-                partIndex++;
-            }
-            if (_DOMImageSizes[1])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, top);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, frameSize.height - top - bottom);
-                partIndex++;
-            }
-            if (bottom)
-            {
-                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, bottom);
-            }
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, 0.0, _DOMImageSizes[0].height);
+            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[2], NULL, 0.0, 0.0);
         }
         else if (_backgroundType == BackgroundHorizontalThreePartImage)
         {
-            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
-                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, frameSize.height);
 
-            partIndex = 0;
-
-            // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
-            if (left)
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], left, frameSize.height);
-                partIndex++;
-            }
-            if (_DOMImageSizes[1])
-            {
-                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width - left - right, frameSize.height);
-                partIndex++;
-            }
-            if (right)
-            {
-                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], right, frameSize.height);
-            }
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
+            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
         }
     }
 #endif
@@ -2209,11 +1937,6 @@ setBoundsOrigin:
         _DOMContentsElement.style.height = ROUND(_CGRectGetHeight(_frame)) + "px";
 
 #if PLATFORM(DOM)
-        // The performance implications of this aren't clear, but without this subviews might not be redrawn when this
-        // view moves.
-        if (CPPlatformHasBug(CPCanvasParentDrawErrorsOnMovementBug))
-            _DOMElement.style.webkitTransform = 'translateX(0)';
-
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMContentsElement);
 #endif
         _graphicsContext = [CPGraphicsContext graphicsContextWithGraphicsPort:graphicsPort flipped:YES];
@@ -2405,43 +2128,6 @@ setBoundsOrigin:
 {
 }
 
-/*!
-    Return yes if the receiver is in a live-resize operation.
-*/
-- (BOOL)inLiveResize
-{
-    return _inLiveResize;
-}
-
-/*!
-    Not implemented.
-
-    A view will be sent this message before a window begins a resize operation. The
-    receiver might choose to simplify its drawing operations during a live resize
-    for speed.
-
-    Subclasses should call super.
-*/
-- (void)viewWillStartLiveResize
-{
-    _inLiveResize = YES;
-}
-
-/*!
-    Not implemented.
-
-    A view will be sent this message after a window finishes a resize operation. The
-    receiver which simplified its drawing operations in viewWillStartLiveResize might
-    stop doing so now. Note the view might no longer be in a window, so use
-    [self setNeedsDisplay:YES] if a final non-simplified redraw is required.
-
-    Subclasses should call super.
-*/
-- (void)viewDidEndLiveResize
-{
-    _inLiveResize = NO;
-}
-
 @end
 
 @implementation CPView (KeyView)
@@ -2857,50 +2543,6 @@ setBoundsOrigin:
     return (_themeAttributes && _themeAttributes[aName] !== undefined);
 }
 
-/*!
-    Registers theme values encoded in an array at runtime. The format of the data in the array
-    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
-    CPColorWithImages() in place of PatternColor(). For more information see the comments
-    at the top of ThemeDescriptors.j.
-
-    @param themeValues array of theme values
-*/
-- (void)registerThemeValues:(CPArray)themeValues
-{
-    for (var i = 0; i < themeValues.length; ++i)
-    {
-        var attributeValueState = themeValues[i],
-            attribute = attributeValueState[0],
-            value = attributeValueState[1],
-            state = attributeValueState[2];
-
-        if (state)
-            [self setValue:value forThemeAttribute:attribute inState:state];
-        else
-            [self setValue:value forThemeAttribute:attribute];
-    }
-}
-
-/*!
-    Registers theme values encoded in an array at runtime. The format of the data in the array
-    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
-    CPColorWithImages() in place of PatternColor(). The values in \c inheritedValues are
-    registered first, then those in \c themeValues override/augment the inherited values.
-    For more information see the comments at the top of ThemeDescriptors.j.
-
-    @param themeValues array of base theme values
-    @param inheritedValues array of overridden/additional theme values
-*/
-- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
-{
-    // Register inherited values first, then override those with the subtheme values.
-    if (inheritedValues)
-        [self registerThemeValues:inheritedValues];
-
-    if (themeValues)
-        [self registerThemeValues:themeValues];
-}
-
 - (CPView)createEphemeralSubviewNamed:(CPString)aViewName
 {
     return nil;
@@ -2965,7 +2607,6 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
     CPViewBoundsKey                 = @"CPViewBoundsKey",
     CPViewFrameKey                  = @"CPViewFrameKey",
     CPViewHitTestsKey               = @"CPViewHitTestsKey",
-    CPViewToolTipKey                = @"CPViewToolTipKey",
     CPViewIsHiddenKey               = @"CPViewIsHiddenKey",
     CPViewOpacityKey                = @"CPViewOpacityKey",
     CPViewSubviewsKey               = @"CPViewSubviewsKey",
@@ -3020,13 +2661,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         _autoresizesSubviews = ![aCoder containsValueForKey:CPViewAutoresizesSubviewsKey] || [aCoder decodeBoolForKey:CPViewAutoresizesSubviewsKey];
 
-        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeBoolForKey:CPViewHitTestsKey];
-
-        [self _setupToolTipHandlers];
-        _toolTip = [aCoder decodeObjectForKey:CPViewToolTipKey];
-
-        if (_toolTip)
-            [self _installToolTipEventHandlers];
+        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeObjectForKey:CPViewHitTestsKey];
 
         // DOM SETUP
 #if PLATFORM(DOM)
@@ -3046,7 +2681,10 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
         }
 #endif
 
-        [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
+        if ([aCoder containsValueForKey:CPViewIsHiddenKey])
+            [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
+        else
+            _isHidden = NO;
 
         if ([aCoder containsValueForKey:CPViewOpacityKey])
             [self setAlphaValue:[aCoder decodeIntForKey:CPViewOpacityKey]];
@@ -3054,7 +2692,8 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
             _opacity = 1.0;
 
         [self setBackgroundColor:[aCoder decodeObjectForKey:CPViewBackgroundColorKey]];
-        [self _setupViewFlags];
+
+        [self setupViewFlags];
 
         _theme = [CPTheme defaultTheme];
         _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
@@ -3135,9 +2774,6 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
     if (_isHidden)
         [aCoder encodeBool:_isHidden forKey:CPViewIsHiddenKey];
 
-    if (_toolTip)
-        [aCoder encodeObject:_toolTip forKey:CPViewToolTipKey];
-
     var nextKeyView = [self nextKeyView];
 
     if (nextKeyView !== nil && ![nextKeyView isEqual:self])
@@ -3163,7 +2799,7 @@ var _CPViewFullScreenModeStateMake = function(aView)
     var superview = aView._superview;
 
     return { autoresizingMask:aView._autoresizingMask, frame:CGRectMakeCopy(aView._frame), index:(superview ? [superview._subviews indexOfObjectIdenticalTo:aView] : 0), superview:superview };
-};
+}
 
 var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
 {
@@ -3260,4 +2896,4 @@ var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
     }*/
 
     return transform;
-};
+}

AppKit/CPViewAnimation.j

@@ -111,8 +111,7 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
             view = [self _targetView:dictionary],
             startFrame = [self _startFrame:dictionary],
             endFrame = [self _endFrame:dictionary],
-            differenceFrame = _CGRectMakeZero(),
-            value = [super currentValue];
+            differenceFrame = _CGRectMakeZero();
 
         differenceFrame.origin.x = endFrame.origin.x - startFrame.origin.x;
         differenceFrame.origin.y = endFrame.origin.y - startFrame.origin.y;
@@ -120,19 +119,19 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
         differenceFrame.size.height = endFrame.size.height - startFrame.size.height;
 
         var intermediateFrame = _CGRectMakeZero();
-        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * value;
-        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * value;
-        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * value;
-        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * value;
+        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * progress;
+        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * progress;
+        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * progress;
+        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * progress;
 
         [view setFrame:intermediateFrame];
 
         // Update the view's alpha value
         var effect = [self _effect:dictionary];
         if (effect === CPViewAnimationFadeInEffect)
-            [view setAlphaValue:1.0 * value];
+            [view setAlphaValue:1.0 * progress];
         else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * value];
+            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * progress];
 
         if (progress === 1.0)
             [self _targetView:view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];

AppKit/CPViewController.j

@@ -66,8 +66,6 @@ var CPViewControllerCachedCibs;
 {
     CPView          _view @accessors(property=view);
     BOOL            _isLoading;
-    BOOL            _isLazy;
-    BOOL            _isViewLoaded @accessors(getter=isViewLoaded);
 
     id              _representedObject @accessors(property=representedObject);
     CPString        _title @accessors(property=title);
@@ -79,10 +77,8 @@ var CPViewControllerCachedCibs;
 
 + (void)initialize
 {
-    if (self !== [CPViewController class])
-        return;
-
-    CPViewControllerCachedCibs = [CPDictionary dictionary];
+    if (self === CPViewController)
+        CPViewControllerCachedCibs = [CPDictionary dictionary];
 }
 
 /*!
@@ -128,7 +124,6 @@ var CPViewControllerCachedCibs;
         _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
 
         _isLoading = NO;
-        _isLazy = NO;
     }
 
     return self;
@@ -141,12 +136,12 @@ var CPViewControllerCachedCibs;
 
     If you create your views manually, you must override this method and use
     it to create your view and assign it to the view property. The default
-    implementation for programmatic views is to create a plain, zero width & height
-    view. You can invoke super to utilize this view.
+    implementation for programmatic views is to create a plain view. You can
+    invoke super to utilize this view.
 
-    If you use Interface Builder to create your views, and you initialize the
-    controller using the initWithCibName:bundle: methods, then you MUST NOT override
-    this method. The consequences risk shattering the space-time continuum.
+    If you use Interface Builder to create your views, you initialize the view
+    using the initWithCibName:bundle: method then you must not override this
+    method. The consequences risk shattering the space-time continuum.
 
     Note: The cib loading system is currently synchronous.
 */
@@ -155,22 +150,17 @@ var CPViewControllerCachedCibs;
     if (_view)
         return;
 
-    if (_cibName)
+    // check if a cib is already cached for the current _cibName
+    var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
+
+    if (!cib)
     {
-        // check if a cib is already cached for the current _cibName
-        var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
-
-        if (!cib)
-        {
-            // if the cib isn't cached yet : fetch it and cache it
-            cib = [[CPCib alloc] initWithCibNamed:_cibName bundle:_cibBundle];
-            [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
-        }
-
-        [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+        // if the cib isn't cached yet : fetch it and cache it
+        cib = [[CPCib alloc] initWithContentsOfURL:[_cibBundle pathForResource:_cibName + @".cib"]];
+        [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
     }
-    else
-        _view = [CPView new];
+
+    [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
 }
 
 /*!
@@ -207,32 +197,20 @@ var CPViewControllerCachedCibs;
             [cibOwner viewControllerDidLoadCib:self];
 
         _isLoading = NO;
-        [self _viewDidLoad];
-    }
-    else if (_isLazy)
-    {
-        _isLazy = NO;
-        [self _viewDidLoad];
+        [self viewDidLoad];
     }
 
     return _view;
 }
 
-- (void)_viewDidLoad
-{
-    [self willChangeValueForKey:"isViewLoaded"];
-    [self viewDidLoad];
-    isViewLoaded = YES;
-    [self didChangeValueForKey:"isViewLoaded"];
-}
 
 /*!
     This method is called after the view controller has loaded its associated views into memory.
 
     This method is called regardless of whether the views were stored in a nib
-    file or created programmatically in the loadView method, but NOT when setView
-    is invoked. This method is most commonly used to perform additional initialization
-    steps on views that are loaded from cib files.
+    file or created programmatically in the loadView method. This method is
+    most commonly used to perform additional initialization steps on views
+    that are loaded from cib files.
 */
 - (void)viewDidLoad
 {
@@ -250,21 +228,13 @@ var CPViewControllerCachedCibs;
 */
 - (void)setView:(CPView)aView
 {
-    var willChangeIsViewLoaded = (_isViewLoaded == NO && aView != nil) || (_isViewLoaded == YES && aView == nil);
-
-    if (willChangeIsViewLoaded)
-        [self willChangeValueForKey:"isViewLoaded"];
+    var viewWasLoaded = !_view;
 
     _view = aView;
-    _isViewLoaded = aView !== nil;
 
-    if (willChangeIsViewLoaded)
-        [self didChangeValueForKey:"isViewLoaded"];
-}
-
-- (BOOL)automaticallyNotifiesObserversOfIsViewLoaded
-{
-    return NO;
+    // Make sure the viewDidLoad method is called if the view is set directly
+    if (!_isLoading && viewWasLoaded)
+        [self viewDidLoad];
 }
 
 @end
@@ -296,7 +266,6 @@ var CPViewControllerViewKey     = @"CPViewControllerViewKey",
         _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle];
 
         _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
-        _isLazy = YES;
     }
 
     return self;

AppKit/CPWebView.j

@@ -199,7 +199,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
             _ignoreLoadEnd = NO;
 
         [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-    };
+    }
 
     if (_iframe.addEventListener)
         _iframe.addEventListener("load", _loadCallback, false);
@@ -830,7 +830,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
 - (@action)reload:(id)sender
 {
     // If we're displaying pure HTML, redisplay it.
-    if (!_url && (_html !== nil))
+    if(!_url && (_html !== nil))
         [self loadHTMLString:_html];
     else
         [self _loadMainFrameURL];
@@ -1032,11 +1032,6 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
     var documentURL = [CPURL URLWithString:window.location.href];
     if ([documentURL isFileURL] && CPFeatureIsCompatible(CPSOPDisabledFromFileURLs))
         return YES;
-
-    // Relative URLs always pass the SOP.
-    if (![self scheme] && ![self host] && ![self port])
-        return YES;
-
     return ([documentURL scheme] == [self scheme] && [documentURL host] == [self host] && [documentURL port] == [self port]);
 }
 

AppKit/CPWindow/_CPAttachedWindowView.j

@@ -1,398 +0,0 @@
-/*
- * _CPAttachedWindowView.j
- * AppKit
- *
- * Created by Antoine Mercadal
- * Copyright 2011 <primalmotion@archipelproject.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "_CPWindowView.j"
-
-#define ALIGN_STROKE(point)  (FLOOR(point) === (point) ? (point) + halfStrokeWidth : (point))
-#define ALIGN_COORD(point)   (FLOOR(point))
-
-var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10),
-    _CPAttachedWindowViewRadius = 5.0,
-    _CPAttachedWindowViewStrokeWidth = 1.0,
-    _CPAttachedWindowViewShadowSize = CGSizeMake(0, 6),
-    _CPAttachedWindowViewShadowBlur = 15.0;
-
-/*!
-    @ignore
-
-    A custom CPWindowView that manages a border and cursor
-*/
-@implementation _CPAttachedWindowView : _CPWindowView
-{
-    float       _arrowOffsetX   @accessors(property=arrowOffsetX);
-    float       _arrowOffsetY   @accessors(property=arrowOffsetY);
-    int         _appearance     @accessors(property=appearance);
-    unsigned    _preferredEdge  @accessors(property=preferredEdge);
-
-    CGSize      _cursorSize;
-}
-
-/*!
-    Compute the contentView frame from a given window frame
-
-    @param aFrameRect the window frame
-*/
-- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
-{
-    var contentRect = CGRectMakeCopy(aFrameRect),
-        modifierX = 16,
-        modifierY = 19;
-
-    // @todo change border art and remove this pixel perfect adaptation
-    //
-    // @comment: If we use this, each time we open the popover, the content
-    // view is reduced a little over and over
-    // return CGRectInset(contentRect, modifierX, modifierY);
-
-    contentRect.origin.x += modifierX;
-    contentRect.origin.y += modifierY;
-    contentRect.size.width -= modifierX * 2;
-    contentRect.size.height -= modifierY * 2;
-
-    return contentRect;
-}
-
-/*!
-    Compute the window frame from a given contentView frame
-
-    @param aContentRect the contentView frame
-*/
-+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
-{
-    var frameRect = CGRectMakeCopy(aContentRect),
-        modifierX = 16,
-        modifierY = 19;
-
-    // @todo change border art and remove this pixel perfect adaptation
-    // @comment: If we use this, each time we open the popover, the content
-    //
-    // view is reduced a little over and over
-    // return CGRectOffset(frameRect, modifierX, modifierY);
-
-    frameRect.origin.x -= modifierX;
-    frameRect.origin.y -= modifierY;
-    frameRect.size.width += modifierX * 2;
-    frameRect.size.height += modifierY * 2;
-
-    return frameRect;
-}
-
-/*!
-    Initialize the _CPWindowView
-*/
-- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
-{
-    if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
-    {
-        _arrowOffsetX = 0.0;
-        _arrowOffsetY = 0.0;
-        _appearance = CPPopoverAppearanceMinimal;
-        _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
-    }
-
-    return self;
-}
-
-/*!
-    Hide the cursor
-*/
-- (void)hideCursor
-{
-    _cursorSize = CGSizeMakeZero();
-    [self setNeedsDisplay:YES];
-}
-
-/*!
-    Show the cursor
-*/
-- (void)showCursor
-{
-    _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
-    [self setNeedsDisplay:YES];
-}
-
-/*!
-    Draw the view
-*/
-- (void)drawRect:(CGRect)aRect
-{
-    [super drawRect:aRect];
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        radius = _CPAttachedWindowViewRadius,
-        arrowWidth = _cursorSize.width,
-        arrowHeight = _cursorSize.height,
-        strokeWidth = _CPAttachedWindowViewStrokeWidth,
-        halfStrokeWidth = strokeWidth / 2.0,
-        strokeColor,
-        shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
-        shadowSize = _CPAttachedWindowViewShadowSize,
-        shadowBlur = _CPAttachedWindowViewShadowBlur,
-        gradient,
-        frame = [self bounds];
-
-    if (_appearance == CPPopoverAppearanceMinimal)
-    {
-        gradient = CGGradientCreateWithColorComponents(
-                        CGColorSpaceCreateDeviceRGB(),
-                        [
-                            (254.0 / 255), (254.0 / 255), (254.0 / 255), 0.93,
-                            (231.0 / 255), (231.0 / 255), (231.0 / 255), 0.93
-                        ],
-                        [0, 1],
-                        2
-                    );
-        strokeColor = [CPColor colorWithHexString:@"B8B8B8"];
-    }
-    else
-    {
-        gradient = CGGradientCreateWithColorComponents(
-                        CGColorSpaceCreateDeviceRGB(),
-                        [
-                            (38.0 / 255), (38.0 / 255), (38.0 / 255), 0.93,
-                            (18.0 / 255), (18.0 / 255), (18.0 / 255), 0.93
-                        ],
-                        [0, 1],
-                        2);
-        strokeColor = [CPColor colorWithHexString:@"222222"];
-    }
-
-    // fix rect to take care of stroke and shadow
-    frame.origin.x += halfStrokeWidth + shadowBlur;
-    frame.origin.y += halfStrokeWidth + (shadowBlur + shadowSize.height / 2);
-    frame.size.width -= strokeWidth + (shadowBlur * 2);
-    frame.size.height -= strokeWidth + (shadowBlur * 2 + shadowSize.height);
-
-    CGContextSetStrokeColor(context, strokeColor);
-    CGContextSetLineWidth(context, strokeWidth);
-    CGContextBeginPath(context);
-    CGContextSetShadowWithColor(context, shadowSize, shadowBlur, shadowColor);
-    CGContextDrawLinearGradient(context, gradient, CGPointMake(CGRectGetMidX(frame), 0.0), CGPointMake(CGRectGetMidX(frame), frame.size.height), 0);
-
-    var xMin = _CGRectGetMinX(frame),
-        xMax = _CGRectGetMaxX(frame),
-        yMin = _CGRectGetMinY(frame),
-        yMax = _CGRectGetMaxY(frame),
-        arrowMinX = ALIGN_COORD(xMin + radius + strokeWidth),
-        arrowMaxX = ALIGN_COORD(xMax - radius - strokeWidth),
-        arrowMinY = ALIGN_COORD(yMin + radius + strokeWidth),
-        arrowMaxY = ALIGN_COORD(yMax - radius + strokeWidth),
-        arrowAnchor = CGPointMakeZero(),
-        arrowStart = CGPointMakeZero(),
-        pt = CGPointMakeZero();
-
-    // draw!
-    switch (_preferredEdge)
-    {
-        case CPMinXEdge:
-        case CPMaxXEdge:
-            // origin nw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMin;
-            CGContextMoveToPoint(context, pt.x, pt.y);
-
-            // ne
-            pt.x = ALIGN_COORD(xMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, yMin, xMax, ALIGN_COORD(yMin + radius));
-
-            if (_preferredEdge === CPMinXEdge)
-            {
-                // arrow CPMinXEdge
-                arrowAnchor.x = ALIGN_STROKE(xMax);
-                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
-
-                // to top edge
-                pt.y = ALIGN_COORD(arrowAnchor.y - (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if (pt.y <= arrowMinY)
-                    pt.y = arrowMinY;
-                else if ((pt.y + arrowWidth) > arrowMaxY)
-                    pt.y = arrowMaxY - arrowWidth;
-
-                pt.x = arrowAnchor.x;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // top edge -> point
-                pt.x = ALIGN_STROKE(arrowAnchor.x + arrowHeight);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> bottom edge
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_COORD(arrowStart.y + arrowWidth);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // se
-            pt.x = xMax;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
-
-            // sw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMax;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
-
-            if (_preferredEdge === CPMaxXEdge)
-            {
-                // arrow CPMaxXEdge
-                arrowAnchor.x = ALIGN_STROKE(xMin);
-                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
-
-                // to bottom edge
-                pt.y = ALIGN_COORD(arrowAnchor.y + (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if ((pt.y - arrowWidth) < arrowMinY)
-                    pt.y = arrowMinY + arrowWidth;
-                else if (pt.y > arrowMaxY)
-                    pt.y = arrowMaxY;
-
-                pt.x = arrowAnchor.x;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // bottom edge -> point
-                pt.x = ALIGN_STROKE(arrowAnchor.x - arrowHeight);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> top edge
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_COORD(arrowStart.y - arrowWidth);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // nw
-            pt.x = xMin;
-            pt.y = ALIGN_COORD(yMin + radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
-            break;
-
-        case CPMaxYEdge:
-        case CPMinYEdge:
-            // origin sw
-            pt.x = xMin;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextMoveToPoint(context, pt.x, pt.y);
-
-            // nw
-            pt.y = ALIGN_COORD(yMin + radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
-
-            if (_preferredEdge === CPMaxYEdge)
-            {
-                // arrow CPMaxYEdge
-                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
-                arrowAnchor.y = ALIGN_STROKE(yMin + _arrowOffsetY);
-
-                // to left edge
-                pt.x = ALIGN_COORD(arrowAnchor.x - (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if (pt.x < arrowMinX)
-                    pt.x = arrowMinX;
-                else if ((pt.x + arrowWidth) > arrowMaxX)
-                    pt.x = arrowMaxX - arrowWidth;
-
-                pt.y = arrowAnchor.y;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // left edge -> point
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_STROKE(arrowAnchor.y - arrowHeight);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> right edge
-                pt.x = ALIGN_COORD(arrowStart.x + arrowWidth);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // ne
-            pt.x = ALIGN_COORD(xMax - radius);
-            pt.y = yMin;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, pt.y, xMax, ALIGN_COORD(yMin + radius));
-
-            // se
-            pt.x = xMax;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
-
-            if (_preferredEdge === CPMinYEdge)
-            {
-                // arrow CPMinYEdge
-                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
-                arrowAnchor.y = ALIGN_STROKE(yMax + _arrowOffsetY);
-
-                // to right edge
-                pt.x = ALIGN_COORD(arrowAnchor.x + (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if ((pt.x - arrowWidth) < arrowMinX)
-                    pt.x = arrowMinX + arrowWidth;
-                else if (pt.x > arrowMaxX)
-                    pt.x = arrowMaxX;
-
-                pt.y = arrowAnchor.y;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // right edge -> point
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_STROKE(arrowAnchor.y + arrowHeight);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> left edge
-                pt.x = ALIGN_COORD(arrowStart.x - arrowWidth);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // sw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMax;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
-            break;
-
-        default:
-            // no computed edge means standard rounded rect
-            CGContextAddPath(context, CGPathWithRoundedRectangleInRect(frame, radius, radius, YES, YES, YES, YES));
-    }
-
-    CGContextClosePath(context);
-    CGContextStrokePath(context);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -33,14 +33,7 @@ var _CPToolbarViewBackgroundColor = nil;
 + (CPColor)toolbarBackgroundColor
 {
     if (!_CPToolbarViewBackgroundColor)
-    {
-        var bundle = [CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]];
-        _CPToolbarViewBackgroundColor = CPColorWithImages([
-                ["_CPToolbarView/toolbar-background-top.png", 1, 1, bundle],
-                ["_CPToolbarView/toolbar-background-center.png", 1, 57.0, bundle],
-                ["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle]
-            ], CPColorPatternIsVertical);
-    }
+        _CPToolbarViewBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]] pathForResource:@"_CPToolbarView/_CPToolbarViewBackground.png"] size:CGSizeMake(1.0, 59.0)]];
 
     return _CPToolbarViewBackgroundColor;
 }

AppKit/CPWindow/_CPDocModalWindowView.j

@@ -24,7 +24,7 @@ var _CPStandardWindowViewBodyBackgroundColor = nil;
     if (self)
     {
         var theClass = [self class],
-            bounds = [self bounds];
+              bounds = [self bounds];
 
        _bodyView = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, _CGRectGetWidth(bounds), _CGRectGetHeight(bounds))];
 
@@ -54,10 +54,4 @@ var _CPStandardWindowViewBodyBackgroundColor = nil;
     return aContentRect;
 }
 
-- (void)_enableSheet:(BOOL)enable
-{
-    // do nothing, already a sheet
-}
-
-@end
-
+@end

AppKit/CPWindow/_CPHUDWindowView.j

@@ -21,24 +21,24 @@
  */
 
 @import "CPTextField.j"
-@import "_CPTitleableWindowView.j"
 
 var _CPHUDWindowViewBackgroundColor = nil,
-    _CPHUDWindowViewThemeValues     = nil,
 
     CPHUDCloseButtonImage           = nil;
 
 var HUD_TITLEBAR_HEIGHT             = 26.0;
 
-@implementation _CPHUDWindowView : _CPTitleableWindowView
+@implementation _CPHUDWindowView : _CPWindowView
 {
     CPView              _toolbarView;
+
+    CPTextField         _titleField;
     CPButton            _closeButton;
 }
 
 + (void)initialize
 {
-    if (self !== [_CPHUDWindowView class])
+    if (self != [_CPHUDWindowView class])
         return;
 
     var bundle = [CPBundle bundleForClass:self];
@@ -60,23 +60,28 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     _CPHUDWindowViewCloseImage        = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowClose.png"] size:CPSizeMake(18.0, 18.0)];
     _CPHUDWindowViewCloseActiveImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowCloseActive.png"] size:CPSizeMake(18.0, 18.0)];
-
-    _CPHUDWindowViewThemeValues = [
-        [@"title-font",                 [CPFont systemFontOfSize:[CPFont systemFontSize] - 1]],
-        [@"title-text-color",           [CPColor colorWithWhite:255.0 / 255.0 alpha:0.75]],
-        [@"title-text-color",           [CPColor colorWithWhite:255.0 / 255.0 alpha:1], CPThemeStateKeyWindow],
-        [@"title-text-shadow-color",    [CPColor blackColor]],
-        [@"title-text-shadow-offset",   CGSizeMake(0.0, 1.0)],
-        [@"title-alignment",            CPCenterTextAlignment],
-        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
-        [@"title-line-break-mode",      CPLineBreakByTruncatingTail],
-        [@"title-vertical-alignment",   CPCenterVerticalTextAlignment]
-    ];
 }
 
-+ (int)titleBarHeight
++ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    return HUD_TITLEBAR_HEIGHT;
+    var contentRect = CGRectMakeCopy(aFrameRect),
+        titleBarHeight = HUD_TITLEBAR_HEIGHT;
+
+    contentRect.origin.y += titleBarHeight;
+    contentRect.size.height -= titleBarHeight;
+
+    return contentRect;
+}
+
++ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = CGRectMakeCopy(aContentRect),
+        titleBarHeight = HUD_TITLEBAR_HEIGHT;
+
+    frameRect.origin.y -= titleBarHeight;
+    frameRect.size.height += titleBarHeight;
+
+    return frameRect;
 }
 
 - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
@@ -85,7 +90,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     if ([[[self window] toolbar] isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;
@@ -100,7 +105,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     if ([[[self window] toolbar] isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
 
         frameRect.origin.y -= toolbarHeight;
         frameRect.size.height += toolbarHeight;
@@ -115,18 +120,37 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     if (self)
     {
-        // Until windows become properly themable, just set these values here in the subclass.
-        [self registerThemeValues:_CPHUDWindowViewThemeValues];
-
         var bounds = [self bounds];
 
         [self setBackgroundColor:_CPHUDWindowViewBackgroundColor];
 
+        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+
+        [_titleField setHitTests:NO];
+        [_titleField setFont:[CPFont systemFontOfSize:11.0]];
+        [_titleField setTextColor:[CPColor whiteColor]];
+        [_titleField setTextShadowColor:[CPColor blackColor]];
+        [_titleField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+
+        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
+        [_titleField setLineBreakMode:CPLineBreakByTruncatingTail];
+        [_titleField setAlignment:CPCenterTextAlignment];
+
+        [_titleField setStringValue:@"Untitled"];
+        [_titleField sizeToFit];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        [_titleField setStringValue:@""];
+
+        [_titleField setFrame:CGRectMake(20.0, 3.0, CGRectGetWidth([self bounds]) - 40.0, CGRectGetHeight([_titleField frame]))];
+
+        [self addSubview:_titleField];
+
         if (_styleMask & CPClosableWindowMask)
         {
             var closeSize = [_CPHUDWindowViewCloseImage size];
 
-            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 4.0, closeSize.width, closeSize.height)];
+            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 5.0, closeSize.width, closeSize.height)];
 
             [_closeButton setBordered:NO];
 
@@ -137,8 +161,6 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
         }
 
         [self setResizeIndicatorOffset:CGSizeMake(5.0, 5.0)];
-
-        [self tile];
     }
 
     return self;
@@ -150,6 +172,11 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
     [_closeButton setAction:@selector(performClose:)];
 }
 
+- (void)setTitle:(CPString)aTitle
+{
+    [_titleField setStringValue:aTitle];
+}
+
 - (_CPToolbarView)toolbarView
 {
     return _toolbarView;
@@ -167,7 +194,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
 - (CGSize)toolbarOffset
 {
-    return _CGSizeMake(0.0, [[self class] titleBarHeight]);
+    return CGSizeMake(0.0, HUD_TITLEBAR_HEIGHT);
 }
 
 - (void)tile
@@ -176,43 +203,14 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     var theWindow = [self window],
         bounds = [self bounds],
-        width = _CGRectGetWidth(bounds);
+        width = CGRectGetWidth(bounds);
 
-    [_titleField setFrame:_CGRectMake(20.0, 0, width - 40.0, [self toolbarOffset].height)];
+    [_titleField setFrame:CGRectMake(20.0, 3.0, width - 40.0, CGRectGetHeight([_titleField frame]))];
 
     var maxY = [self toolbarMaxY];
-    if ([_titleField isHidden])
-        maxY -= ([self toolbarOffset]).height;
 
-    var contentRect = _CGRectMake(0.0, maxY, width, _CGRectGetHeight(bounds) - maxY);
-
-    [[theWindow contentView] setFrame:contentRect];
-}
-
-- (void)_enableSheet:(BOOL)enable
-{
-    [super _enableSheet:enable];
-
-    [_closeButton setHidden:enable];
-    [_titleField setHidden:enable];
-
-    // resize the window
-    var theWindow = [self window],
-        frame = [theWindow frame],
-        dy = ([self toolbarOffset]).height;
-
-    if (enable)
-        dy = -dy;
-
-    var newHeight = _CGRectGetMaxY(frame) + dy,
-        newWidth = _CGRectGetMaxX(frame);
-
-    frame.size.height += dy;
-
-    [self setFrameSize:_CGSizeMake(newWidth, newHeight)];
-    [self tile];
-    [theWindow setFrame:frame display:NO animate:NO];
-    [theWindow setMovableByWindowBackground:!enable];
+    [[theWindow contentView] setFrameOrigin:CGPointMake(0.0, maxY, width, CGRectGetHeight(bounds) - maxY)];
 }
 
 @end
+

AppKit/CPWindow/_CPStandardWindowView.j

@@ -21,7 +21,7 @@
  */
 
 @import "CPTextField.j"
-@import "_CPTitleableWindowView.j"
+@import "_CPWindowView.j"
 
 
 var GRADIENT_HEIGHT = 41.0;
@@ -98,44 +98,31 @@ var _CPTexturedWindowHeadGradientColor  = nil,
 
 var _CPStandardWindowViewBodyBackgroundColor                = nil,
     _CPStandardWindowViewDividerBackgroundColor             = nil,
+    _CPStandardWindowViewTitleBackgroundColor               = nil,
     _CPStandardWindowViewCloseButtonImage                   = nil,
     _CPStandardWindowViewCloseButtonHighlightedImage        = nil,
     _CPStandardWindowViewCloseButtonUnsavedImage            = nil,
     _CPStandardWindowViewCloseButtonUnsavedHighlightedImage = nil,
     _CPStandardWindowViewMinimizeButtonImage                = nil,
-    _CPStandardWindowViewMinimizeButtonHighlightedImage     = nil,
-    _CPStandardWindowViewThemeValues                        = nil;
+    _CPStandardWindowViewMinimizeButtonHighlightedImage     = nil;
 
-var STANDARD_GRADIENT_HEIGHT                    = 41.0;
+var STANDARD_GRADIENT_HEIGHT                    = 41.0,
+    STANDARD_TITLEBAR_HEIGHT                    = 25.0;
 
-@implementation _CPStandardWindowView : _CPTitleableWindowView
+@implementation _CPStandardWindowView : _CPWindowView
 {
     _CPTexturedWindowHeadView   _headView;
     CPView                      _dividerView;
     CPView                      _bodyView;
     CPView                      _toolbarView;
 
+    CPTextField                 _titleField;
     CPButton                    _closeButton;
     CPButton                    _minimizeButton;
 
     BOOL                        _isDocumentEdited;
 }
 
-+ (void)initialize
-{
-    _CPStandardWindowViewThemeValues = [
-        [@"title-font",                 [CPFont boldSystemFontOfSize:CPFontCurrentSystemSize]],
-        [@"title-text-color",           [CPColor colorWithWhite:22.0 / 255.0 alpha:0.75]],
-        [@"title-text-color",           [CPColor colorWithWhite:22.0 / 255.0 alpha:1], CPThemeStateKeyWindow],
-        [@"title-text-shadow-color",    [CPColor whiteColor]],
-        [@"title-text-shadow-offset",   CGSizeMake(0.0, 1.0)],
-        [@"title-alignment",            CPCenterTextAlignment],
-        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
-        [@"title-line-break-mode",      CPLineBreakByTruncatingTail],
-        [@"title-vertical-alignment",   CPCenterVerticalTextAlignment]
-    ];
-}
-
 + (CPColor)bodyBackgroundColor
 {
     if (!_CPStandardWindowViewBodyBackgroundColor)
@@ -152,15 +139,79 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     return _CPStandardWindowViewDividerBackgroundColor;
 }
 
++ (CPColor)titleColor
+{
+    if (!_CPStandardWindowViewTitleBackgroundColor)
+        _CPStandardWindowViewTitleBackgroundColor = [CPColor colorWithCalibratedRed:44.0 / 255.0 green:44.0 / 255.0 blue:44.0 / 255.0 alpha:1.0];
+
+    return _CPStandardWindowViewTitleBackgroundColor;
+}
+
++ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = CGRectMakeCopy(aFrameRect),
+        titleBarHeight = [self titleBarHeight] + 1.0;
+
+    contentRect.origin.y += titleBarHeight;
+    contentRect.size.height -= titleBarHeight;
+
+    return contentRect;
+}
+
++ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = CGRectMakeCopy(aContentRect),
+        titleBarHeight = [self titleBarHeight] + 1.0;
+
+    frameRect.origin.y -= titleBarHeight;
+    frameRect.size.height += titleBarHeight;
+
+    return frameRect;
+}
+
++ (float)titleBarHeight
+{
+    return STANDARD_TITLEBAR_HEIGHT;
+}
+
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = [[self class] contentRectForFrameRect:aFrameRect],
+        theToolbar = [[self window] toolbar];
+
+    if ([theToolbar isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+
+        contentRect.origin.y += toolbarHeight;
+        contentRect.size.height -= toolbarHeight;
+    }
+
+    return contentRect;
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = [[self class] frameRectForContentRect:aContentRect],
+        theToolbar = [[self window] toolbar];
+
+    if ([theToolbar isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+
+        frameRect.origin.y -= toolbarHeight;
+        frameRect.size.height += toolbarHeight;
+    }
+
+    return frameRect;
+}
+
 - (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
 {
     self = [super initWithFrame:aFrame styleMask:aStyleMask];
 
     if (self)
     {
-        // Until windows become properly themable, just set these values here in the subclass.
-        [self registerThemeValues:_CPStandardWindowViewThemeValues];
-
         var theClass = [self class],
             bounds = [self bounds];
 
@@ -169,7 +220,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
         [_headView setAutoresizingMask:CPViewWidthSizable];;
         [_headView setHitTests:NO];
 
-        [self addSubview:_headView positioned:CPWindowBelow relativeTo:_titleField];
+        [self addSubview:_headView];
 
         _dividerView = [[CPView alloc] initWithFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), CGRectGetWidth(bounds), 1.0)];
 
@@ -191,6 +242,24 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
 
         [self setResizeIndicatorOffset:CGSizeMake(2.0, 2.0)];
 
+        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+
+        [_titleField setFont:[CPFont boldSystemFontOfSize:12.0]];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+
+        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
+        [_titleField setLineBreakMode:CPLineBreakByTruncatingTail];
+        [_titleField setAlignment:CPCenterTextAlignment];
+        [_titleField setTextShadowColor:[CPColor whiteColor]];
+        [_titleField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+
+        [_titleField setStringValue:@"Untitled"];
+        [_titleField sizeToFit];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        [_titleField setStringValue:@""];
+
+        [self addSubview:_titleField];
+
         if (_styleMask & CPClosableWindowMask)
         {
             if (!_CPStandardWindowViewCloseButtonImage)
@@ -203,7 +272,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
                 _CPStandardWindowViewCloseButtonUnsavedHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonUnsavedHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
             }
 
-            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 6.0, 16.0, 16.0)];
+            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 7.0, 16.0, 16.0)];
 
             [_closeButton setBordered:NO];
             [self _updateCloseButton];
@@ -257,20 +326,14 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
 
     var theWindow = [self window],
         bounds = [self bounds],
-        width = _CGRectGetWidth(bounds);
+        width = CGRectGetWidth(bounds);
 
-    [_headView setFrameSize:_CGSizeMake(width, [self toolbarMaxY])];
-    [_dividerView setFrame:_CGRectMake(0.0, _CGRectGetMaxY([_headView frame]), width, 1.0)];
+    [_headView setFrameSize:CGSizeMake(width, [self toolbarMaxY])];
+    [_dividerView setFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), width, 1.0)];
 
-    var dividerMaxY = 0,
-        dividerMinY = 0;
-    if (![_dividerView isHidden])
-    {
-        dividerMinY = _CGRectGetMinY([_dividerView frame]);
-        dividerMaxY = _CGRectGetMaxY([_dividerView frame]);
-    }
+    var dividerMaxY = CGRectGetMaxY([_dividerView frame]);
 
-    [_bodyView setFrame:_CGRectMake(0.0, dividerMaxY, width, _CGRectGetHeight(bounds) - dividerMaxY)];
+    [_bodyView setFrame:CGRectMake(0.0, dividerMaxY, width, CGRectGetHeight(bounds) - dividerMaxY)];
 
     var leftOffset = 8;
 
@@ -279,13 +342,10 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     if (_minimizeButton)
         leftOffset += 19.0;
 
-    [_titleField setFrame:_CGRectMake(leftOffset, 0, width - leftOffset * 2.0, [[self class] titleBarHeight])];
+    [_titleField setFrame:CGRectMake(leftOffset, 5.0, width - leftOffset * 2.0, CGRectGetHeight([_titleField frame]))];
 
-    var contentRect = _CGRectMake(0.0, dividerMaxY, width, _CGRectGetHeight([_bodyView frame]));
-
-    [[theWindow contentView] setFrame:contentRect];
+    [[theWindow contentView] setFrameOrigin:CGPointMake(0.0, CGRectGetMaxY([_dividerView frame]))];
 }
-
 /*
 - (void)setAnimatingToolbar:(BOOL)isAnimatingToolbar
 {
@@ -334,46 +394,17 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     [self _updateCloseButton];
 }
 
-- (BOOL)couldBeMoveEvent:(CPEvent)anEvent
+- (void)setTitle:(CPString)aTitle
 {
-    if (![_headView isHidden])
-        if (CGRectContainsPoint([_headView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
-            return YES;
-
-    return [super couldBeMoveEvent:anEvent];
+    [_titleField setStringValue:aTitle];
 }
 
-- (void)_enableSheet:(BOOL)enable
+- (void)mouseDown:(CPEvent)anEvent
 {
-    [super _enableSheet:enable];
+    if (CGRectContainsPoint([_headView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+        return [self trackMoveWithEvent:anEvent];
 
-    [_headView setHidden:enable];
-    [_dividerView setHidden:enable];
-    [_closeButton setHidden:enable];
-    [_minimizeButton setHidden:enable];
-    [_titleField setHidden:enable];
-
-    if (enable)
-        [_bodyView setBackgroundColor:[_CPDocModalWindowView bodyBackgroundColor]];
-    else
-        [_bodyView setBackgroundColor:[[self class] bodyBackgroundColor]];
-
-    // resize the window
-    var theWindow = [self window],
-        frame = [theWindow frame];
-
-    var dy = _CGRectGetHeight([_headView frame]) + _CGRectGetHeight([_dividerView frame]);
-    if (enable)
-        dy = -dy;
-
-    var newHeight = _CGRectGetMaxY(frame) + dy,
-        newWidth = _CGRectGetMaxX(frame);
-
-    frame.size.height += dy;
-
-    [self setFrameSize:_CGSizeMake(newWidth, newHeight)];
-    [self tile];
-    [theWindow setFrame:frame display:NO animate:NO];
+    [super mouseDown:anEvent];
 }
 
 @end

AppKit/CPWindow/_CPTitleableWindowView.j

@@ -1,114 +0,0 @@
-/*
- * _CPTitleableWindowView.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "_CPWindowView.j"
-
-var STANDARD_TITLEBAR_HEIGHT = 25.0;
-
-@implementation _CPTitleableWindowView : _CPWindowView
-{
-    CPTextField         _titleField;
-}
-
-+ (int)titleBarHeight
-{
-    return STANDARD_TITLEBAR_HEIGHT;
-}
-
-+ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
-{
-    var contentRect = CGRectMakeCopy(aFrameRect),
-        titleBarHeight = [[self class] titleBarHeight];
-
-    contentRect.origin.y += titleBarHeight;
-    contentRect.size.height -= titleBarHeight;
-
-    return contentRect;
-}
-
-+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
-{
-    var frameRect = CGRectMakeCopy(aContentRect),
-        titleBarHeight = [[self class] titleBarHeight];
-
-    frameRect.origin.y -= titleBarHeight;
-    frameRect.size.height += titleBarHeight;
-
-    return frameRect;
-}
-
-- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
-{
-    self = [super initWithFrame:aFrame styleMask:aStyleMask];
-
-    if (self)
-    {
-        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_titleField setHitTests:NO];
-        [_titleField setStringValue:@"Untitled"];
-        [_titleField sizeToFit];
-        [_titleField setAutoresizingMask:CPViewWidthSizable];
-        [_titleField setStringValue:@""];
-
-        [_titleField setFrame:CGRectMake(20.0, 3.0, CGRectGetWidth([self bounds]) - 40.0, CGRectGetHeight([_titleField frame]))];
-
-        [self addSubview:_titleField];
-
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    [_titleField setStringValue:aTitle];
-}
-
-- (void)tile
-{
-    [super tile];
-
-    var theWindow = [self window],
-        bounds = [self bounds],
-        width = CGRectGetWidth(bounds);
-
-    // The vertical alignment of the title is set by the theme, so just give it all available space. By default
-    // the title will vertically centre within.
-    [_titleField setFrame:_CGRectMake(20.0, 0, width - 40.0, [[self class] titleBarHeight])];
-}
-
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [_titleField setTextColor:[self currentValueForThemeAttribute:@"title-text-color"]];
-    [_titleField setFont:[self currentValueForThemeAttribute:@"title-font"]];
-    [_titleField setAlignment:[self currentValueForThemeAttribute:@"title-alignment"]];
-    [_titleField setVerticalAlignment:[self currentValueForThemeAttribute:@"title-vertical-alignment"]];
-    [_titleField setLineBreakMode:[self currentValueForThemeAttribute:@"title-line-break-mode"]];
-    [_titleField setTextShadowColor:[self currentValueForThemeAttribute:@"title-text-shadow-color"]];
-    [_titleField setTextShadowOffset:[self currentValueForThemeAttribute:@"title-text-shadow-offset"]];
-}
-
-@end

AppKit/CPWindow/_CPToolTipWindowView.j

@@ -27,31 +27,15 @@
 {
     BOOL            _mouseDownPressed   @accessors(getter=isMouseDownPressed, setter=setMouseDownPressed:);
     unsigned        _gravity            @accessors(property=gravity);
+
+    CPColor         _backgroundColor;
+    CPColor         _strokeColor;
 }
 
 
 #pragma mark -
 #pragma mark Class methods
 
-+ (CPString)defaultThemeClass
-{
-    return @"tooltip";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPColor colorWithHexString:@"E3E3E3"],
-                                                [CPColor colorWithHexString:@"FFFFCA"],
-                                                2.0,
-                                                1.0,
-                                                [CPColor blackColor]]
-                                       forKeys:[@"stroke-color",
-                                                @"background-color",
-                                                @"border-radius",
-                                                @"stroke-width",
-                                                @"color"]];
-}
-
 /*! compute the contentView frame from a given window frame
     @param aFrameRect the window frame
 */
@@ -83,6 +67,21 @@
 }
 
 
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
+    {
+        _strokeColor = [CPColor colorWithHexString:@"E3E3E3"];
+        _backgroundColor = [CPColor colorWithHexString:@"FFFFCA"];
+    }
+
+    return self;
+}
+
+
 #pragma mark -
 #pragma mark drawing
 
@@ -91,13 +90,11 @@
     [super drawRect:aRect];
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        radius = [self currentValueForThemeAttribute:@"border-radius"],
-        strokeWidth = [self currentValueForThemeAttribute:@"stroke-width"],
-        strokeColor = [self currentValueForThemeAttribute:@"stroke-color"],
-        bgColor = [self currentValueForThemeAttribute:@"background-color"];
+        radius = 2,
+        strokeWidth = 1;
 
-    CGContextSetStrokeColor(context, strokeColor);
-    CGContextSetFillColor(context, bgColor);
+    CGContextSetStrokeColor(context, _strokeColor);
+    CGContextSetFillColor(context, _backgroundColor);
     CGContextSetLineWidth(context, strokeWidth);
     CGContextBeginPath(context);
 

AppKit/CPWindow/_CPWindowView.j

@@ -24,18 +24,7 @@
 @import "CPView.j"
 
 
-var _CPWindowViewResizeIndicatorImage = nil,
-    _CPWindowViewCornerResizeRectWidth = 10,
-
-    _CPWindowViewResizeRegionNone = -1,
-    _CPWindowViewResizeRegionTopLeft = 0,
-    _CPWindowViewResizeRegionTop = 1,
-    _CPWindowViewResizeRegionTopRight = 2,
-    _CPWindowViewResizeRegionRight = 3,
-    _CPWindowViewResizeRegionBottomRight = 4,
-    _CPWindowViewResizeRegionBottom = 5,
-    _CPWindowViewResizeRegionBottomLeft = 6,
-    _CPWindowViewResizeRegionLeft = 7;
+var _CPWindowViewResizeIndicatorImage = nil;
 
 @implementation _CPWindowView : CPView
 {
@@ -49,73 +38,37 @@ var _CPWindowViewResizeIndicatorImage = nil,
 //    BOOL        _isAnimatingToolbar;
 
     CGRect      _resizeFrame;
-    int         _resizeRegion;
     CGPoint     _mouseDraggedPoint;
 
     CGRect      _cachedScreenFrame;
-
-    CPView      _sheetShadowView;
 }
 
 + (void)initialize
 {
-    if (self !== [_CPWindowView class])
+    if (self != [_CPWindowView class])
         return;
 
-    _CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:_CGSizeMake(12.0, 12.0)];
+    _CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:CGSizeMake(12.0, 12.0)];
 }
 
 + (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    return _CGRectMakeCopy(aFrameRect);
+    return CGRectMakeCopy(aFrameRect);
 }
 
 + (CGRect)frameRectForContentRect:(CGRect)aContentRect
 {
-    return _CGRectMakeCopy(aContentRect);
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "window";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPColor blackColor], [CPFont systemFontOfSize:CPFontCurrentSystemSize], [CPNull null], _CGSizeMakeZero(), CPCenterTextAlignment, CPLineBreakByTruncatingTail, CPTopVerticalTextAlignment]
-                                       forKeys:[@"title-text-color", @"title-font", @"title-text-shadow-color", @"title-text-shadow-offset", @"title-alignment", @"title-line-break-mode", @"title-vertical-alignment"]];
+    return CGRectMakeCopy(aContentRect);
 }
 
 - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    var contentRect = [[self class] contentRectForFrameRect:aFrameRect],
-        theToolbar = [[self window] toolbar];
-
-    if ([theToolbar isVisible])
-    {
-        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
-
-        contentRect.origin.y += toolbarHeight;
-        contentRect.size.height -= toolbarHeight;
-    }
-
-    return contentRect;
+    return [[self class] contentRectForFrameRect:aFrameRect];
 }
 
 - (CGRect)frameRectForContentRect:(CGRect)aContentRect
 {
-    var frameRect = [[self class] frameRectForContentRect:aContentRect],
-        theToolbar = [[self window] toolbar];
-
-    if ([theToolbar isVisible])
-    {
-        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
-
-        frameRect.origin.y -= toolbarHeight;
-        frameRect.size.height += toolbarHeight;
-    }
-
-    return frameRect;
+    return [[self class] frameRectForContentRect:aContentRect];
 }
 
 - (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
@@ -125,8 +78,8 @@ var _CPWindowViewResizeIndicatorImage = nil,
     if (self)
     {
         _styleMask = aStyleMask;
-        _resizeIndicatorOffset = _CGSizeMakeZero();
-        _toolbarOffset = _CGSizeMakeZero();
+        _resizeIndicatorOffset = CGSizeMakeZero();
+        _toolbarOffset = CGSizeMakeZero();
     }
 
     return self;
@@ -147,356 +100,49 @@ var _CPWindowViewResizeIndicatorImage = nil,
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    var theWindow = [self window],
-        couldResize = _styleMask & CPResizableWindowMask;
+    var theWindow = [self window];
 
-    couldResize = couldResize && (
-        (CPWindowResizeStyle === CPWindowResizeStyleModern) ||
-        ((CPWindowResizeStyle === CPWindowResizeStyleLegacy) && _resizeIndicator));
-
-    if (couldResize)
+    if ((_styleMask & CPResizableWindowMask) && _resizeIndicator)
     {
-        var theWindow = [self window],
-            windowFrame = [theWindow frame],
-            shouldResize = NO;
+        // FIXME: This should be better
+        var frame = [_resizeIndicator frame];
 
-        if (CPWindowResizeStyle === CPWindowResizeStyleModern)
-        {
-            var globalPoint = [theWindow convertBaseToGlobal:[anEvent locationInWindow]];
-
-            _resizeRegion = [self resizeRegionForPoint:globalPoint];
-            shouldResize = _resizeRegion !== _CPWindowViewResizeRegionNone;
-        }
-        else
-        {
-            // Extend the resize frame to the edge of the window frame
-            var resizeFrame = [_resizeIndicator frame];
-            resizeFrame.size.width = _CGRectGetWidth(windowFrame) - _CGRectGetMinX(resizeFrame);
-            resizeFrame.size.height = _CGRectGetHeight(windowFrame) - _CGRectGetMinY(resizeFrame);
-
-            var localPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-            shouldResize = CGRectContainsPoint(resizeFrame, localPoint);
-
-            // When in legacy mode, the only possible resize region is lower right
-            _resizeRegion = shouldResize ? _CPWindowViewResizeRegionBottomRight : _CPWindowViewResizeRegionNone;
-        }
-
-        if (shouldResize)
+        if (CGRectContainsPoint(frame, [self convertPoint:[anEvent locationInWindow] fromView:nil]))
             return [self trackResizeWithEvent:anEvent];
     }
 
-    if ([self couldBeMoveEvent:anEvent])
+    if ([theWindow isMovableByWindowBackground])
         [self trackMoveWithEvent:anEvent];
+
     else
         [super mouseDown:anEvent];
 }
 
-- (BOOL)couldBeMoveEvent:(CPEvent)anEvent
-{
-    var theWindow = [self window];
-
-    return [theWindow isMovable] && [theWindow isMovableByWindowBackground];
-}
-
-/*
-    aPoint should be in global coordinates
-*/
-- (int)resizeRegionForPoint:(CGPoint)aPoint
-{
-    /*
-        If the window is fixed width (minSize.width === maxSize.width), there
-        are 2 possible resize rects: top and bottom.
-
-        If the window is fixed height (minSize.height === maxSize.height), there
-        are 2 possible resize rects: left and right.
-
-        Otherwise there are 8 possible resize rects, 1 for each side and 1 for each corner.
-        The four corner rects are the same size, and the top/bottom and left/right
-        rects are the same size. So to save calculations, we can just create
-        3 rects and move them around to do hit testing. Start with the corners
-        and then do left/right and top/bottom.
-    */
-    var wind = [self window],
-        frame = [wind frame],
-        rect,
-        minSize = [wind minSize],
-        maxSize = [wind maxSize],
-        isFixedWidth = minSize.width === maxSize.width,
-        isFixedHeight = minSize.height === maxSize.height;
-
-    if (isFixedWidth)
-    {
-        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
-                           frame.origin.y - CPWindowResizeSlop,
-                           frame.size.width + (CPWindowResizeSlop * 2),
-                           CPWindowResizeSlop * 2);
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionTop;
-
-        rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionBottom;
-    }
-    else if (isFixedHeight)
-    {
-        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
-                           frame.origin.y - CPWindowResizeSlop,
-                           CPWindowResizeSlop * 2,
-                           frame.size.height + (CPWindowResizeSlop * 2));
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionLeft;
-
-        rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionRight;
-    }
-    else
-    {
-        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
-                           frame.origin.y - CPWindowResizeSlop,
-                           _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop,
-                           _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop);
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionTopLeft;
-
-        rect.origin.x = _CGRectGetMaxX(frame) - _CPWindowViewCornerResizeRectWidth;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionTopRight;
-
-        rect.origin.y = _CGRectGetMaxY(frame) - _CPWindowViewCornerResizeRectWidth;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionBottomRight;
-
-        rect.origin.x = frame.origin.x - CPWindowResizeSlop;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionBottomLeft;
-
-        rect = _CGRectMake(rect.origin.x,
-                           frame.origin.y + _CPWindowViewCornerResizeRectWidth,
-                           CPWindowResizeSlop * 2,
-                           _CGRectGetHeight(frame) - (_CPWindowViewCornerResizeRectWidth * 2));
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionLeft;
-
-        rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionRight;
-
-        rect = _CGRectMake(frame.origin.x + _CPWindowViewCornerResizeRectWidth,
-                           frame.origin.y - CPWindowResizeSlop,
-                           _CGRectGetWidth(frame) - (_CPWindowViewCornerResizeRectWidth * 2),
-                           CPWindowResizeSlop * 2);
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionTop;
-
-        rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
-
-        if (_CGRectContainsPoint(rect, aPoint))
-            return _CPWindowViewResizeRegionBottom;
-    }
-
-    return _CPWindowViewResizeRegionNone;
-}
-
-/*
-    aPoint is in window coordinates
-*/
-- (void)setCursorForLocation:(CGPoint)aPoint resizing:(BOOL)isResizing
-{
-    var theWindow = [self window];
-
-    if ([theWindow isFullPlatformWindow] ||
-        !(_styleMask & CPResizableWindowMask) ||
-        (CPWindowResizeStyle !== CPWindowResizeStyleModern))
-        return;
-
-    var globalPoint = [theWindow convertBaseToGlobal:aPoint],
-        resizeRegion = isResizing ? _resizeRegion : [self resizeRegionForPoint:globalPoint],
-        minSize = nil,
-        maxSize = nil,
-        frameSize;
-
-    if (resizeRegion !== _CPWindowViewResizeRegionNone)
-    {
-        minSize = [theWindow minSize];
-        maxSize = [theWindow maxSize];
-        frameSize = [theWindow frame].size;
-    }
-
-    switch (resizeRegion)
-    {
-        case _CPWindowViewResizeRegionTopLeft:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeNorthwestCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeSoutheastCursor] set];
-            else
-                [[CPCursor resizeNorthwestSoutheastCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionTop:
-            if (minSize && (frameSize.height === minSize.height))
-                [[CPCursor resizeUpCursor] set];
-            else if (maxSize && (frameSize.height === maxSize.height))
-                [[CPCursor resizeDownCursor] set];
-            else if ([CPMenu menuBarVisible] && (_CGRectGetMinY([theWindow frame]) <= [CPMenu menuBarHeight]))
-                [[CPCursor resizeDownCursor] set];
-            else
-                [[CPCursor resizeNorthSouthCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionTopRight:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeNortheastCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeSouthwestCursor] set];
-            else
-                [[CPCursor resizeNortheastSouthwestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionRight:
-            if (minSize && (frameSize.width === minSize.width))
-                [[CPCursor resizeRightCursor] set];
-            else if (maxSize && (frameSize.width === maxSize.width))
-                [[CPCursor resizeLeftCursor] set];
-            else
-                [[CPCursor resizeEastWestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottomRight:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeSoutheastCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeNorthwestCursor] set];
-            else
-                [[CPCursor resizeNorthwestSoutheastCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottom:
-            if (minSize && (frameSize.height === minSize.height))
-                [[CPCursor resizeDownCursor] set];
-            else if (maxSize && (frameSize.height === maxSize.height))
-                [[CPCursor resizeUpCursor] set];
-            else
-                [[CPCursor resizeNorthSouthCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottomLeft:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeSouthwestCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeNortheastCursor] set];
-            else
-                [[CPCursor resizeNortheastSouthwestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionLeft:
-            if (minSize && (frameSize.width === minSize.width))
-                [[CPCursor resizeLeftCursor] set];
-            else if (maxSize && (frameSize.width === maxSize.width))
-                [[CPCursor resizeRightCursor] set];
-            else
-                [[CPCursor resizeEastWestCursor] set];
-            break;
-
-        default:
-            [[CPCursor arrowCursor] set];
-    }
-}
-
 - (void)trackResizeWithEvent:(CPEvent)anEvent
 {
-    var type = [anEvent type];
+    var location = [anEvent locationInWindow],
+        type = [anEvent type];
 
     if (type === CPLeftMouseUp)
         return;
 
-    var location = [anEvent locationInWindow],
-        theWindow = [self window],
-        globalLocation = [theWindow convertBaseToGlobal:location],
-        frame = [theWindow frame];
+    var theWindow = [self window];
 
     if (type === CPLeftMouseDown)
     {
-        _mouseDraggedPoint = _CGPointMakeCopy(globalLocation);
-        _resizeFrame = _CGRectMakeCopy(frame);
+        var frame = [theWindow frame];
+
+        _resizeFrame = CGRectMake(location.x, location.y, CGRectGetWidth(frame), CGRectGetHeight(frame));
     }
 
     else if (type === CPLeftMouseDragged)
     {
-        var diffX = globalLocation.x - _mouseDraggedPoint.x,
-            diffY = globalLocation.y - _mouseDraggedPoint.y,
-            newX = _CGRectGetMinX(_resizeFrame),
-            newY = _CGRectGetMinY(_resizeFrame),
-            newWidth = _CGRectGetWidth(_resizeFrame),
-            newHeight = _CGRectGetHeight(_resizeFrame),
-            platformFrame = [[theWindow platformWindow] usableContentFrame],
-            minSize = [theWindow minSize],
-            maxSize = [theWindow maxSize];
+        var newSize = CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame));
 
-        // Calculate x and width first
-        switch (_resizeRegion)
-        {
-            case _CPWindowViewResizeRegionTopLeft:
-            case _CPWindowViewResizeRegionLeft:
-            case _CPWindowViewResizeRegionBottomLeft:
-                if (minSize && diffX > 0)
-                    diffX = MIN(newWidth - minSize.width, diffX);
-                else if (maxSize && diffX < 0)
-                    diffX = MAX(newWidth - maxSize.width, diffX);
+        if (theWindow._isSheet && theWindow._parentView && (theWindow._frame.size.width !== newSize.width))
+        [theWindow._parentView _setAttachedSheetFrameOrigin];
 
-                newX += diffX,
-                newWidth -= diffX;
-                break;
-
-            case _CPWindowViewResizeRegionTopRight:
-            case _CPWindowViewResizeRegionRight:
-            case _CPWindowViewResizeRegionBottomRight:
-                newWidth += diffX;
-                break;
-        }
-
-        // Now calculate y and height
-        switch (_resizeRegion)
-        {
-            case _CPWindowViewResizeRegionTopLeft:
-            case _CPWindowViewResizeRegionTop:
-            case _CPWindowViewResizeRegionTopRight:
-                if (minSize && diffY > 0)
-                    diffY = MIN(newHeight - minSize.height, diffY);
-                else if (maxSize && diffY < 0)
-                    diffY = MAX(newHeight - maxSize.height, diffY);
-
-                newY += diffY,
-                newHeight -= diffY;
-                break;
-
-            case _CPWindowViewResizeRegionBottomLeft:
-            case _CPWindowViewResizeRegionBottom:
-            case _CPWindowViewResizeRegionBottomRight:
-                newHeight += diffY;
-                break;
-        }
-
-        if (theWindow._isSheet && theWindow._parentView && (frame.size.width !== newWidth))
-            [theWindow._parentView _setAttachedSheetFrameOrigin];
-
-        // Constrain resize to fit within the platform window.
-        var newFrame = CGRectIntersection(_CGRectMake(newX, newY, newWidth, newHeight), platformFrame);
-
-        [theWindow setFrame:newFrame];
-        [self setCursorForLocation:location resizing:YES];
+        [theWindow setFrameSize:newSize];
     }
 
     [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
@@ -518,19 +164,16 @@ var _CPWindowViewResizeIndicatorImage = nil,
     if ([CPMenu menuBarVisible])
         minPointY = [[CPApp mainMenu] menuBarHeight];
 
-    var restrictedPoint = _CGPointMake(0, 0);
+    var restrictedPoint = CGPointMake(0, 0);
 
-    restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), _CGRectGetMaxX(visibleFrame) - 4.0);
-    restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), _CGRectGetMaxY(visibleFrame) - 8.0);
+    restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), CGRectGetMaxX(visibleFrame) - 4.0);
+    restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), CGRectGetMaxY(visibleFrame) - 8.0);
 
     return restrictedPoint;
 }
 
 - (void)trackMoveWithEvent:(CPEvent)anEvent
 {
-    if (![[self window] isMovable])
-        return;
-
     var type = [anEvent type];
 
     if (type === CPLeftMouseUp)
@@ -538,18 +181,21 @@ var _CPWindowViewResizeIndicatorImage = nil,
         _cachedScreenFrame = nil;
         return;
     }
+
     else if (type === CPLeftMouseDown)
     {
         _mouseDraggedPoint = [[self window] convertBaseToGlobal:[anEvent locationInWindow]];
         _cachedScreenFrame = [[CPPlatformWindow primaryPlatformWindow] visibleFrame];
     }
+
     else if (type === CPLeftMouseDragged)
     {
         var theWindow = [self window],
             frame = [theWindow frame],
             location = [theWindow convertBaseToGlobal:[anEvent locationInWindow]],
-            origin = [self _pointWithinScreenFrame:_CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x),
-                                                                _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
+            origin = [self _pointWithinScreenFrame:CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x),
+                                                               _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
+
         [theWindow setFrameOrigin:origin];
 
         _mouseDraggedPoint = [self _pointWithinScreenFrame:location];
@@ -558,25 +204,14 @@ var _CPWindowViewResizeIndicatorImage = nil,
     [CPApp setTarget:self selector:@selector(trackMoveWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
-- (void)setFrameSize:(CGSize)newSize
-{
-    [super setFrameSize:newSize];
-
-    // reposition sheet if the parent window resizes or moves
-    var theWindow = [self window];
-
-    if ([theWindow attachedSheet])
-        [theWindow _setAttachedSheetFrameOrigin];
-}
-
 - (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
 {
-    if (shouldShowResizeIndicator && CPWindowResizeStyle === CPWindowResizeStyleLegacy)
+    if (shouldShowResizeIndicator)
     {
         var size = [_CPWindowViewResizeIndicatorImage size],
             boundsSize = [self frame].size;
 
-        _resizeIndicator = [[CPImageView alloc] initWithFrame:_CGRectMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height, size.width, size.height)];
+        _resizeIndicator = [[CPImageView alloc] initWithFrame:CGRectMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height, size.width, size.height)];
 
         [_resizeIndicator setImage:_CPWindowViewResizeIndicatorImage];
         [_resizeIndicator setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
@@ -598,7 +233,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
 
 - (void)setResizeIndicatorOffset:(CGSize)anOffset
 {
-    if (_CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
+    if (CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
         return;
 
     _resizeIndicatorOffset = anOffset;
@@ -609,7 +244,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
     var size = [_resizeIndicator frame].size,
         boundsSize = [self frame].size;
 
-    [_resizeIndicator setFrameOrigin:_CGPointMake(boundsSize.width - size.width - anOffset.width, boundsSize.height - size.height - anOffset.height)];
+    [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - anOffset.width, boundsSize.height - size.height - anOffset.height)];
 }
 
 - (CGSize)resizeIndicatorOffset
@@ -645,7 +280,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
     if (!_toolbarView || [_toolbarView isHidden])
         return [self toolbarOffset].height;
 
-    return _CGRectGetMaxY([_toolbarView frame]);
+    return CGRectGetMaxY([_toolbarView frame]);
 }
 
 - (_CPToolbarView)toolbarView
@@ -657,14 +292,14 @@ var _CPWindowViewResizeIndicatorImage = nil,
 {
     var theWindow = [self window],
         bounds = [self bounds],
-        width = _CGRectGetWidth(bounds);
+        width = CGRectGetWidth(bounds);
 
     if ([[theWindow toolbar] isVisible])
     {
         var toolbarView = [self toolbarView],
             toolbarOffset = [self toolbarOffset];
 
-        [toolbarView setFrame:_CGRectMake(toolbarOffset.width, toolbarOffset.height, width, _CGRectGetHeight([toolbarView frame]))];
+        [toolbarView setFrame:CGRectMake(toolbarOffset.width, toolbarOffset.height, width, CGRectGetHeight([toolbarView frame]))];
     }
 
     if ([self showsResizeIndicator])
@@ -672,7 +307,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
         var size = [_resizeIndicator frame].size,
             boundsSize = [self bounds].size;
 
-        [_resizeIndicator setFrameOrigin:_CGPointMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height)];
+        [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height)];
     }
 }
 
@@ -712,23 +347,6 @@ var _CPWindowViewResizeIndicatorImage = nil,
 
     [self tile];
 }
-
-- (void)noteKeyWindowStateChanged
-{
-    if ([[self window] isKeyWindow])
-        [self setThemeState:CPThemeStateKeyWindow];
-    else
-        [self unsetThemeState:CPThemeStateKeyWindow];
-}
-
-- (void)noteMainWindowStateChanged
-{
-    if ([[self window] isMainWindow])
-        [self setThemeState:CPThemeStateMainWindow];
-    else
-        [self unsetThemeState:CPThemeStateMainWindow];
-}
-
 /*
 - (void)setAnimatingToolbar:(BOOL)isAnimatingToolbar
 {
@@ -749,21 +367,4 @@ var _CPWindowViewResizeIndicatorImage = nil,
     [self addSubview:_resizeIndicator];
 }
 
-- (void)_enableSheet:(BOOL)enable
-{
-    if (enable)
-    {
-        var bundle = [CPBundle bundleForClass:[CPWindow class]];
-        _sheetShadowView = [[CPView alloc] initWithFrame:_CGRectMake(0, 0, _CGRectGetWidth([self bounds]), 8)];
-        [_sheetShadowView setAutoresizingMask:CPViewWidthSizable];
-        [_sheetShadowView setBackgroundColor:[CPColor colorWithPatternImage:[[CPImage alloc]
-            initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowAttachedSheetShadow.png"] size:_CGSizeMake(9, 8)]]];
-        [self addSubview:_sheetShadowView];
-    }
-    else
-    {
-        [_sheetShadowView removeFromSuperview];
-    }
-}
-
 @end

AppKit/CPWindowController.j

@@ -33,7 +33,7 @@
     @class CPWindowController
 
     An instance of a CPWindowController manages a CPWindow. Windows are typically loaded via a cib,
-    but they can also manage windows created in code. A CPWindowController can manage a window by
+    but they can also manage windows created in code. A CPWindowController can manage a window by 
     itself or work with  AppKits's document-based architecture.
 
     In a Document based app, a CPWindowController instance is created and managed by a CPDocument subclass.
@@ -181,7 +181,8 @@
 
         if (!_window)
         {
-            var reason = [CPString stringWithFormat:@"Window for %@ could not be loaded from Cib or no window specified. Override loadWindow to load the window manually.", self];
+            var reason = [CPString stringWithFormat:@"Window for %@ could not be loaded from Cib or no window specified. \
+                                                        Override loadWindow to load the window manually.", self];
 
             [CPException raise:CPInternalInconsistencyException reason:reason];
         }
@@ -285,7 +286,7 @@
 
     // Change of document means toolbar items may no longer make sense.
     // FIXME: DOCUMENT ARCHITECTURE Should we setToolbar: as well?
-    [[[self window] toolbar] _autoValidateVisibleItems];
+    [[[self window] toolbar] validateVisibleItems];
 }
 
 - (void)setSupportsMultipleDocuments:(BOOL)shouldSupportMultipleDocuments
@@ -332,41 +333,6 @@
 
 - (void)setViewControllerContainerView:(CPView)aView
 {
-    if (!_viewControllerContainerView && !aView)
-        return;
-
-    var viewController = [self viewController],
-        viewControllerView = [viewController isViewLoaded] ? [viewController view] : nil,
-        contentView = [[self window] contentView];
-
-    if (aView)
-    {
-        [aView setFrame:[contentView frame]];
-        [aView setAutoresizingMask:[contentView autoresizingMask]];
-
-        if (viewControllerView)
-        {
-            [viewControllerView removeFromSuperview];
-            [aView addSubview:viewControllerView];
-        }
-
-        [[self window] setContentView:aView];
-    }
-    else if (viewControllerView)
-    {
-        [viewControllerView removeFromSuperview];
-        [viewControllerView setFrame:[contentView frame]];
-        [viewControllerView setAutoresizingMask:[contentView autoresizingMask]]
-        [[self window] setContentView:viewControllerView];
-    }
-    else
-    {
-        var view = [[CPView alloc] init];
-        [view setFrame:[contentView frame]];
-        [view setAutoresizingMask:[contentView autoresizingMask]];
-        [[self window] setContentView:view]
-    }
-
     _viewControllerContainerView = aView;
 }
 
@@ -377,47 +343,21 @@
 
 - (void)setViewController:(CPViewController)aViewController
 {
-    if (!_viewController && !aViewController)
-        return;
+    var containerView = [self viewControllerContainerView] || [[self window] contentView],
+        view = [_viewController view],
+        frame = view ? [view frame] : [containerView bounds];
 
-    var containerView = [self viewControllerContainerView],
-        newView = [aViewController isViewLoaded] ? [aViewController view] : nil;
-
-    if (containerView)
-    {
-        var oldView = [_viewController isViewLoaded] ? [_viewController view] : nil;
-
-        if (oldView)
-        {
-            [newView setFrame:[oldView frame]];
-            [newView setAutoresizingMask:[oldView autoresizingMask]];
-        }
-
-        if (oldView && newView)
-            [containerView replaceSubview:oldView with:newView];
-        else if (oldView)
-            [oldView removeFromSuperview];
-        else if (newView)
-            [containerView addSubview:newView];
-    }
-    else if (newView)
-    {
-        var contentView = [[self window] contentView];
-        [newView setFrame:[contentView frame]];
-        [newView setAutoresizingMask:[contentView autoresizingMask]];
-        [[self window] setContentView:newView];
-    }
-    else
-    {
-        var view = [[CPView alloc] init],
-            contentView = [[self window] contentView];
-
-        [view setFrame:[contentView frame]];
-        [view setAutoresizingMask:[contentView autoresizingMask]];
-        [[self window] setContentView:view]
-    }
+    [view removeFromSuperview];
 
     _viewController = aViewController;
+
+    view = [_viewController view];
+
+    if (view)
+    {
+        [view setFrame:frame];
+        [containerView addSubview:view];
+    }
 }
 
 - (CPViewController)viewController

AppKit/CPWorkspace.j

@@ -1,56 +0,0 @@
-/*
- * CPWorkspace.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-@import <Foundation/CPString.j>
-
-var SharedWorkspace = nil;
-
-
-@implementation CPWorkspace : CPObject
-{
-
-}
-
-+ (CPWorkspace)sharedWorkspace
-{
-    if (!SharedWorkspace)
-        SharedWorkspace = [CPWorkspace new];
-
-    return SharedWorkspace;
-}
-
-- (BOOL)openFile:(CPString)fullPath
-{
-    var url = [CPURL URLWithString:fullPath];
-    return [self openURL:url];
-}
-
-- (BOOL)openURL:(CPURL)url
-{
-    if (!url || ![url absoluteURL])
-        return NO;
-    window.open([url absoluteURL]);
-    return YES;
-}
-
-@end