Merge branch 'master' of github.com:cappuccino/cappuccino

AppKit/CPApplication.j

@@ -86,6 +86,7 @@ CPRunContinuesResponse  = -1002;
     CPArray                 _eventListeners;
 
     CPEvent                 _currentEvent;
+    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -583,12 +584,14 @@ CPRunContinuesResponse  = -1002;
     _currentEvent = anEvent;
     CPEventModifierFlags = [anEvent modifierFlags];
 
+    var theWindow = [anEvent window];
+
 #if PLATFORM(DOM)
-    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[theWindow 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
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
+    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
 #endif
 
     // Check if this is a candidate for key equivalent...
@@ -600,7 +603,7 @@ CPRunContinuesResponse  = -1002;
 
         // Unconditionally propagate on these keys to solve browser copy paste bugs
         if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
+            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
 #endif
 
         return;
@@ -608,7 +611,7 @@ CPRunContinuesResponse  = -1002;
 
 #if PLATFORM(DOM)
     // if we make it this far, then restore the original willPropagate value
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
+    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
 #endif
 
     if (_eventListeners.length)
@@ -619,7 +622,16 @@ CPRunContinuesResponse  = -1002;
         return;
     }
 
-    [[anEvent window] sendEvent:anEvent];
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
 }
 
 /*!

AppKit/CPCursor.j

@@ -25,7 +25,8 @@ Cursor support by browser:
 
 var currentCursor = nil,
     cursorStack = [],
-    cursors = {};
+    cursors = {},
+    ieCursorMap = {};
 
 @implementation CPCursor : CPObject
 {
@@ -36,6 +37,20 @@ 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])
@@ -44,23 +59,30 @@ var currentCursor = nil,
     return self;
 }
 
-// hotspot is supported in CSS3 (but not IE).
-- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
+/*!
+    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 = hotSpot;
     _image = image;
     return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }
 
-// 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
+/*!
+    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
 {
     return [self initWithImage:image hotSpot:hotSpot];
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:"none"]; // Not supported in IE
+    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
 }
 
 + (void)unhide
@@ -121,6 +143,7 @@ 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
@@ -130,22 +153,34 @@ 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 = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
+            cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString];
         else
-            cssString = aString
+        {
+            // 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;
+        }
+
         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
@@ -163,6 +198,36 @@ 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];
@@ -188,11 +253,21 @@ 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/CPWindow/CPWindow.j

@@ -186,6 +186,11 @@ CPWindowShadowStyleStandard = 0;
 CPWindowShadowStyleMenu     = 1;
 CPWindowShadowStylePanel    = 2;
 
+CPWindowResizeStyleModern = 0;
+CPWindowResizeStyleLegacy = 1;
+CPWindowResizeStyle = CPWindowResizeStyleModern;
+CPWindowResizeSlop = 3;
+
 var SHADOW_MARGIN_LEFT      = 20.0,
     SHADOW_MARGIN_RIGHT     = 19.0,
     SHADOW_MARGIN_TOP       = 10.0,
@@ -197,7 +202,8 @@ var SHADOW_MARGIN_LEFT      = 20.0,
 var CPWindowSaveImage       = nil,
     CPWindowSavingImage     = nil,
 
-    CPWindowResizeTime      = 0.2;
+    CPWindowResizeTime      = 0.2,
+    CPWindowResizeStyleGlobalChangeNotification = @"CPWindowResizeStyleGlobalChangeNotification";
 
 /*
     Keys for which action messages will be sent by default when unhandled, e.g. complete:.
@@ -477,6 +483,11 @@ CPTexturedBackgroundWindowMask
         _keyViewLoopIsDirty = YES;
 
         [self setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
+
+        [[CPNotificationCenter defaultCenter] addObserver:self
+                                 selector:@selector(_didReceiveResizeStyleChange:)
+                                     name:CPWindowResizeStyleGlobalChangeNotification
+                                   object:nil];
     }
 
     return self;
@@ -996,6 +1007,33 @@ CPTexturedBackgroundWindowMask
     return _isVisible;
 }
 
+/*!
+    Globally sets whether windows resize following the legacy style (using a resize thumb
+    in the bottom right corner), or the modern style (no resize thumb, resizing
+    can be done on all edges).
+*/
++ (void)setGlobalResizeStyle:(int)aStyle
+{
+    if (CPWindowResizeStyle === aStyle)
+        return;
+
+    CPWindowResizeStyle = aStyle;
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowResizeStyleGlobalChangeNotification object:nil];
+}
+
+- (void)_didReceiveResizeStyleChange:(CPNotification)aNotification
+{
+    [_windowView setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
+}
+
+/*!
+    Returns the global window resizing style.
+*/
++ (int)globalResizeStyle
+{
+    return CPWindowResizeStyle;
+}
+
 /*!
     Returns \c YES if the window's resize indicator is showing. \c NO otherwise.
 */
@@ -1500,6 +1538,11 @@ CPTexturedBackgroundWindowMask
     _ignoresMouseEvents = shouldIgnoreMouseEvents;
 }
 
+- (void)_mouseExitedResizeRect
+{
+    [[CPCursor arrowCursor] set];
+}
+
 // Managing Titles
 
 /*!
@@ -1642,6 +1685,7 @@ CPTexturedBackgroundWindowMask
     // CPLeftMouseDown is needed for window moving and resizing to work.
     // CPMouseMoved is needed for rollover effects on title bar buttons.
     var sheet = [self attachedSheet];
+
     if (sheet)
     {
         switch (type)
@@ -1663,162 +1707,175 @@ CPTexturedBackgroundWindowMask
 
     switch (type)
     {
-        case CPFlagsChanged:        return [[self firstResponder] flagsChanged:anEvent];
+        case CPFlagsChanged:
+            return [[self firstResponder] flagsChanged:anEvent];
 
-        case CPKeyUp:               return [[self firstResponder] keyUp:anEvent];
+        case CPKeyUp:
+            return [[self firstResponder] keyUp:anEvent];
 
-        case CPKeyDown:             if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
-                                    {
-                                        if ([anEvent modifierFlags] & CPShiftKeyMask)
-                                            [self selectPreviousKeyView:self];
-                                        else
-                                            [self selectNextKeyView:self];
+        case CPKeyDown:
+            if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
+            {
+                if ([anEvent modifierFlags] & CPShiftKeyMask)
+                    [self selectPreviousKeyView:self];
+                else
+                    [self selectNextKeyView:self];
 #if PLATFORM(DOM)
-                                        // Make sure the browser doesn't try to do its own tab handling.
-                                        // This is important or the browser might blur the shared text field or token field input field,
-                                        // even that we just moved it to a new first responder.
-                                        [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                // Make sure the browser doesn't try to do its own tab handling.
+                // This is important or the browser might blur the shared text field or token field input field,
+                // even that we just moved it to a new first responder.
+                [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
 #endif
-                                        return;
-                                    }
-                                    else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
-                                    {
-                                        var didTabBack = [self selectPreviousKeyView:self];
-                                        if (didTabBack)
-                                        {
+                return;
+            }
+            else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
+            {
+                var didTabBack = [self selectPreviousKeyView:self];
+
+                if (didTabBack)
+                {
 #if PLATFORM(DOM)
-                                            // Make sure the browser doesn't try to do its own tab handling.
-                                            // This is important or the browser might blur the shared text field or token field input field,
-                                            // even that we just moved it to a new first responder.
-                                            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                    // Make sure the browser doesn't try to do its own tab handling.
+                    // This is important or the browser might blur the shared text field or token field input field,
+                    // even that we just moved it to a new first responder.
+                    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
 #endif
-                                        }
+                }
 
-                                        return didTabBack;
-                                    }
+                return didTabBack;
+            }
 
-                                    [[self firstResponder] keyDown:anEvent];
+            [[self firstResponder] keyDown:anEvent];
 
-                                    // Trigger the default button if needed
-                                    // FIXME: Is this only applicable in a sheet? See isse: #722.
-                                    if (![self disableKeyEquivalentForDefaultButton])
-                                    {
-                                        var defaultButton = [self defaultButton],
-                                            keyEquivalent = [defaultButton keyEquivalent],
-                                            modifierMask = [defaultButton keyEquivalentModifierMask];
+            // Trigger the default button if needed
+            // FIXME: Is this only applicable in a sheet? See isse: #722.
+            if (![self disableKeyEquivalentForDefaultButton])
+            {
+                var defaultButton = [self defaultButton],
+                    keyEquivalent = [defaultButton keyEquivalent],
+                    modifierMask = [defaultButton keyEquivalentModifierMask];
 
-                                        if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
-                                            [[self defaultButton] performClick:self];
-                                    }
+                if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
+                    [[self defaultButton] performClick:self];
+            }
 
-                                    return;
+            return;
 
-        case CPScrollWheel:         return [[_windowView hitTest:point] scrollWheel:anEvent];
+        case CPScrollWheel:
+            return [[_windowView hitTest:point] scrollWheel:anEvent];
 
         case CPLeftMouseUp:
-        case CPRightMouseUp:        var hitTestedView = _leftMouseDownView,
-                                        selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
+        case CPRightMouseUp:
+            var hitTestedView = _leftMouseDownView,
+                selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
 
-                                    if (!hitTestedView)
-                                        hitTestedView = [_windowView hitTest:point];
+            if (!hitTestedView)
+                hitTestedView = [_windowView hitTest:point];
 
-                                    [hitTestedView performSelector:selector withObject:anEvent];
+            [hitTestedView performSelector:selector withObject:anEvent];
 
-                                    _leftMouseDownView = nil;
+            _leftMouseDownView = nil;
+
+            return;
 
-                                    return;
         case CPLeftMouseDown:
-        case CPRightMouseDown:      _leftMouseDownView = [_windowView hitTest:point];
+        case CPRightMouseDown:
+            _leftMouseDownView = [_windowView hitTest:point] || _windowView;
 
-                                    if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
-                                        [self makeFirstResponder:_leftMouseDownView];
+            if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
+                [self makeFirstResponder:_leftMouseDownView];
 
-                                    [CPApp activateIgnoringOtherApps:YES];
+            [CPApp activateIgnoringOtherApps:YES];
 
-                                    var theWindow = [anEvent window],
-                                        selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
+            var theWindow = [anEvent window],
+                selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
 
-                                    if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey])
-                                        return [_leftMouseDownView performSelector:selector withObject:anEvent];
-                                    else
-                                    {
-                                        // FIXME: delayed ordering?
-                                        [self makeKeyAndOrderFront:self];
+            if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey])
+                return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            else
+            {
+                // FIXME: delayed ordering?
+                [self makeKeyAndOrderFront:self];
 
-                                        if ([_leftMouseDownView acceptsFirstMouse:anEvent])
-                                            return [_leftMouseDownView performSelector:selector withObject:anEvent];
-                                    }
-                                    break;
+                if ([_leftMouseDownView acceptsFirstMouse:anEvent])
+                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            }
+            break;
 
         case CPLeftMouseDragged:
-        case CPRightMouseDragged:   if (!_leftMouseDownView)
-                                        return [[_windowView hitTest:point] mouseDragged:anEvent];
+        case CPRightMouseDragged:
+            if (!_leftMouseDownView)
+                return [[_windowView hitTest:point] mouseDragged:anEvent];
 
-                                    var selector;
-                                    if (type == CPRightMouseDragged)
-                                    {
-                                        selector = @selector(rightMouseDragged:)
-                                        if (![_leftMouseDownView respondsToSelector:selector])
-                                            selector = nil;
-                                    }
+            var selector;
 
-                                    if (!selector)
-                                        selector = @selector(mouseDragged:)
+            if (type == CPRightMouseDragged)
+            {
+                selector = @selector(rightMouseDragged:)
+                if (![_leftMouseDownView respondsToSelector:selector])
+                    selector = nil;
+            }
 
-                                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            if (!selector)
+                selector = @selector(mouseDragged:)
 
-        case CPMouseMoved:          if (!_acceptsMouseMovedEvents)
-                                        return;
+            return [_leftMouseDownView performSelector:selector withObject:anEvent];
 
-                                    if (!_mouseEnteredStack)
-                                        _mouseEnteredStack = [];
+        case CPMouseMoved:
+            [_windowView setCursorForLocation:point resizing:NO];
 
-                                    var hitTestView = [_windowView hitTest:point];
+            if (!_acceptsMouseMovedEvents)
+                return;
 
-                                    if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
-                                        return [hitTestView mouseMoved:anEvent];
+            if (!_mouseEnteredStack)
+                _mouseEnteredStack = [];
 
-                                    var view = hitTestView,
-                                        mouseEnteredStack = [];
+            var hitTestView = [_windowView hitTest:point];
 
-                                    while (view)
-                                    {
-                                        mouseEnteredStack.unshift(view);
+            if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
+                return [hitTestView mouseMoved:anEvent];
 
-                                        view = [view superview];
-                                    }
+            var view = hitTestView,
+                mouseEnteredStack = [];
 
-                                    var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
+            while (view)
+            {
+                mouseEnteredStack.unshift(view);
 
-                                    while (deviation--)
-                                        if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
-                                            break;
+                view = [view superview];
+            }
 
-                                    var index = deviation + 1,
-                                        count = _mouseEnteredStack.length;
+            var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
 
-                                    if (index < count)
-                                    {
-                                        var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+            while (deviation--)
+                if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
+                    break;
 
-                                        for (; index < count; ++index)
-                                            [_mouseEnteredStack[index] mouseExited:event];
-                                    }
+            var index = deviation + 1,
+                count = _mouseEnteredStack.length;
 
-                                    index = deviation + 1;
-                                    count = mouseEnteredStack.length;
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
 
-                                    if (index < count)
-                                    {
-                                        var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+                for (; index < count; ++index)
+                    [_mouseEnteredStack[index] mouseExited:event];
+            }
 
-                                        for (; index < count; ++index)
-                                            [mouseEnteredStack[index] mouseEntered:event];
-                                    }
+            index = deviation + 1;
+            count = mouseEnteredStack.length;
 
-                                    _mouseEnteredStack = mouseEnteredStack;
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
 
-                                    [hitTestView mouseMoved:anEvent];
+                for (; index < count; ++index)
+                    [mouseEnteredStack[index] mouseEntered:event];
+            }
+
+            _mouseEnteredStack = mouseEnteredStack;
+
+            [hitTestView mouseMoved:anEvent];
     }
 }
 
@@ -2165,6 +2222,7 @@ CPTexturedBackgroundWindowMask
         return;
 
     var documents = [_windowController documents];
+
     if ([documents count])
     {
         var index = [documents indexOfObject:[_windowController document]];
@@ -3237,6 +3295,15 @@ var keyViewComparator = function(lhs, rhs, context)
     return CGRectContainsPoint(_frame, aPoint);
 }
 
+- (BOOL)_isValidMousePoint:(CGPoint)aPoint
+{
+    // If we are using the new resizing mode, mouse events are valid
+    // outside the window's frame for non-full platform windows.
+    var mouseFrame = (!_isFullPlatformWindow && (_styleMask & CPResizableWindowMask) && (CPWindowResizeStyle === CPWindowResizeStyleModern)) ? _CGRectInset(_frame, -CPWindowResizeSlop, -CPWindowResizeSlop) : _frame;
+
+    return CGRectContainsPoint(mouseFrame, aPoint);
+}
+
 @end
 
 @implementation CPWindow (Deprecated)

AppKit/CPWindow/_CPStandardWindowView.j

@@ -334,13 +334,13 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     [self _updateCloseButton];
 }
 
-- (void)mouseDown:(CPEvent)anEvent
+- (BOOL)couldBeMoveEvent:(CPEvent)anEvent
 {
     if (![_headView isHidden])
         if (CGRectContainsPoint([_headView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
-            return [self trackMoveWithEvent:anEvent];
+            return YES;
 
-    [super mouseDown:anEvent];
+    return [super couldBeMoveEvent:anEvent];
 }
 
 - (void)_enableSheet:(BOOL)enable

AppKit/CPWindow/_CPWindowView.j

@@ -24,7 +24,18 @@
 @import "CPView.j"
 
 
-var _CPWindowViewResizeIndicatorImage = nil;
+var _CPWindowViewResizeIndicatorImage = nil,
+    _CPWindowViewCornerResizeRectWidth = 10,
+
+    _CPWindowViewResizeRegionNone = -1,
+    _CPWindowViewResizeRegionTopLeft = 0,
+    _CPWindowViewResizeRegionTop = 1,
+    _CPWindowViewResizeRegionTopRight = 2,
+    _CPWindowViewResizeRegionRight = 3,
+    _CPWindowViewResizeRegionBottomRight = 4,
+    _CPWindowViewResizeRegionBottom = 5,
+    _CPWindowViewResizeRegionBottomLeft = 6,
+    _CPWindowViewResizeRegionLeft = 7;
 
 @implementation _CPWindowView : CPView
 {
@@ -38,6 +49,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 //    BOOL        _isAnimatingToolbar;
 
     CGRect      _resizeFrame;
+    int         _resizeRegion;
     CGPoint     _mouseDraggedPoint;
 
     CGRect      _cachedScreenFrame;
@@ -50,17 +62,17 @@ var _CPWindowViewResizeIndicatorImage = nil;
     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);
+    return _CGRectMakeCopy(aContentRect);
 }
 
 + (CPString)defaultThemeClass
@@ -81,7 +93,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
     if ([theToolbar isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;
@@ -97,7 +109,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
     if ([theToolbar isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
 
         frameRect.origin.y -= toolbarHeight;
         frameRect.size.height += toolbarHeight;
@@ -113,8 +125,8 @@ var _CPWindowViewResizeIndicatorImage = nil;
     if (self)
     {
         _styleMask = aStyleMask;
-        _resizeIndicatorOffset = CGSizeMakeZero();
-        _toolbarOffset = CGSizeMakeZero();
+        _resizeIndicatorOffset = _CGSizeMakeZero();
+        _toolbarOffset = _CGSizeMakeZero();
     }
 
     return self;
@@ -135,48 +147,310 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    var theWindow = [self window];
+    var theWindow = [self window],
+        couldResize = _styleMask & CPResizableWindowMask;
 
-    if ((_styleMask & CPResizableWindowMask) && _resizeIndicator)
+    couldResize = couldResize && (
+        (CPWindowResizeStyle === CPWindowResizeStyleModern) ||
+        ((CPWindowResizeStyle === CPWindowResizeStyleLegacy) && _resizeIndicator));
+
+    if (couldResize)
     {
-        // FIXME: This should be better
-        var frame = [_resizeIndicator frame];
+        var theWindow = [self window],
+            windowFrame = [theWindow frame],
+            shouldResize = NO;
 
-        if (CGRectContainsPoint(frame, [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+        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)
             return [self trackResizeWithEvent:anEvent];
     }
 
-    if ([theWindow isMovable] && [theWindow isMovableByWindowBackground])
+    if ([self couldBeMoveEvent:anEvent])
         [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
+{
+    /*
+        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 frame = [[self window] frame],
+        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 location = [anEvent locationInWindow],
-        type = [anEvent type];
+    var type = [anEvent type];
 
     if (type === CPLeftMouseUp)
         return;
 
-    var theWindow = [self window];
+    var location = [anEvent locationInWindow],
+        theWindow = [self window],
+        globalLocation = [theWindow convertBaseToGlobal:location],
+        frame = [theWindow frame];
 
     if (type === CPLeftMouseDown)
     {
-        var frame = [theWindow frame];
-
-        _resizeFrame = CGRectMake(location.x, location.y, CGRectGetWidth(frame), CGRectGetHeight(frame));
+        _mouseDraggedPoint = _CGPointMakeCopy(globalLocation);
+        _resizeFrame = _CGRectMakeCopy(frame);
     }
 
     else if (type === CPLeftMouseDragged)
     {
-        var newSize = CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame));
+        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];
 
-        if (theWindow._isSheet && theWindow._parentView && (theWindow._frame.size.width !== newSize.width))
+        // 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);
+
+                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];
 
-        [theWindow setFrameSize:newSize];
+        // 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];
     }
 
     [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
@@ -198,10 +472,10 @@ 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;
 }
@@ -228,8 +502,8 @@ var _CPWindowViewResizeIndicatorImage = nil;
         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];
@@ -251,12 +525,12 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
 - (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
 {
-    if (shouldShowResizeIndicator)
+    if (shouldShowResizeIndicator && CPWindowResizeStyle === CPWindowResizeStyleLegacy)
     {
         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];
@@ -278,7 +552,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
 - (void)setResizeIndicatorOffset:(CGSize)anOffset
 {
-    if (CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
+    if (_CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
         return;
 
     _resizeIndicatorOffset = anOffset;
@@ -289,7 +563,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
@@ -325,7 +599,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
     if (!_toolbarView || [_toolbarView isHidden])
         return [self toolbarOffset].height;
 
-    return CGRectGetMaxY([_toolbarView frame]);
+    return _CGRectGetMaxY([_toolbarView frame]);
 }
 
 - (_CPToolbarView)toolbarView
@@ -337,14 +611,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])
@@ -352,7 +626,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)];
     }
 }
 

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -1177,7 +1177,6 @@ var resizeTimer = nil;
 {
     var type = _overriddenEventType || aDOMEvent.type;
 
-
     // IE's event order is down, up, up, dblclick, so we have create these events artificially.
     if (type === @"dblclick")
     {
@@ -1208,7 +1207,7 @@ var resizeTimer = nil;
         windowNumber = [_mouseDownWindow windowNumber];
     else
     {
-        var theWindow = [self hitTest:location];
+        var theWindow = [self _mouseHitTest:location];
 
         if ((aDOMEvent.type === CPDOMEventMouseDown) && theWindow)
             _mouseDownWindow = theWindow;
@@ -1308,6 +1307,7 @@ var resizeTimer = nil;
     // if there are any tracking event listeners then show the event guard so we don't lose events to iframes
     // TODO Actually check for tracking event listeners, not just any listener but _CPRunModalLoop.
     var hasTrackingEventListener = NO;
+
     for (var i = 0; i < CPApp._eventListeners.length; i++)
     {
         if (CPApp._eventListeners[i]._callback !== _CPRunModalLoop)
@@ -1316,6 +1316,7 @@ var resizeTimer = nil;
             break;
         }
     }
+
     _lastMouseEventLocation = location;
 
     _DOMEventGuard.style.display = hasTrackingEventListener ? "" : "none";
@@ -1486,7 +1487,17 @@ var resizeTimer = nil;
     return StopContextMenuDOMEventPropagation;
 }
 
+- (CPWindow)_mouseHitTest:(CPPoint)location
+{
+    return [self _hitTest:location withTest:@selector(_isValidMousePoint:)]
+}
+
 - (CPWindow)hitTest:(CPPoint)location
+{
+    return [self _hitTest:location withTest:@selector(containsPoint:)]
+}
+
+- (CPWindow)_hitTest:(CPPoint)location withTest:(SEL)aTest
 {
     if (self._only)
         return self._only;
@@ -1505,7 +1516,7 @@ var resizeTimer = nil;
         {
             var candidateWindow = windows[windowCount];
 
-            if (!candidateWindow._ignoresMouseEvents && [candidateWindow containsPoint:location])
+            if (!candidateWindow._ignoresMouseEvents && [candidateWindow performSelector:aTest withObject:location])
                 theWindow = candidateWindow;
         }
     }

Tests/Manual/CPToolbarTest/AppController.j

@@ -40,7 +40,7 @@
         if (!hasIcon && hasTallItem)
             continue;
 
-        var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(x, y, 400, 20) styleMask:CPTitledWindowMask],
+        var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(x, y, 400, 20) styleMask:CPTitledWindowMask | CPResizableWindowMask],
             contentView = [theWindow contentView];
 
         [theWindow setTitle:"Toolbar (LBL: " + hasLabel + " ICN: " + hasIcon + " SMALL: " + isSmall + " TALLITEM: " + hasTallItem + ")"];

Tests/Manual/CPWindowResizeStyle/AppController.j

@@ -0,0 +1,31 @@
+/*
+ * AppController.j
+ * resize
+ *
+ * Created by You on December 24, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+
+
+@implementation AppController : CPObject
+{
+    @outlet CPWindow theWindow;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+}
+
+- (void)awakeFromCib
+{
+    [theWindow setFullPlatformWindow:YES];
+}
+
+- (@action)resizeStyleDidChange:(id)sender
+{
+    [CPWindow setGlobalResizeStyle:[[sender selectedRadio] tag]];
+}
+
+@end

Tests/Manual/CPWindowResizeStyle/Info.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>resize</string>
+</dict>
+</plist>

Tests/Manual/CPWindowResizeStyle/Jakefile

@@ -0,0 +1,94 @@
+/*
+ * Jakefile
+ * resize
+ *
+ * Created by You on December 24, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("resize", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "resize.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("resize");
+    task.setIdentifier("com.yourcompany.resize");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("resize");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+    task.setNib2CibFlags("-R Resources/");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["resize"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "resize", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "resize", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "resize"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "resize"), FILE.join("Build", "Deployment", "resize")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "resize"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "resize"), FILE.join("Build", "Desktop", "resize", "resize.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "resize", "resize.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "resize"));
+    print("----------------------------");
+}

Tests/Manual/CPWindowResizeStyle/Resources/MainMenu.cib

@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;84E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;86E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;103E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;107E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;109E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;57E;D;K;6;Line truncated

Tests/Manual/CPWindowResizeStyle/index-debug.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ CPWindowResizeStyle
+
+ Created by You on December 24, 2012.
+ Copyright 2012, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPWindowResizeStyle</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPWindowResizeStyle...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>

Tests/Manual/CPWindowResizeStyle/index.html

@@ -0,0 +1,77 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index.html
+ CPWindowResizeStyle
+
+ Created by You on December 24, 2012.
+ Copyright 2012, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPWindowResizeStyle</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPWindowResizeStyle...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>

Tests/Manual/CPWindowResizeStyle/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * resize
+ *
+ * Created by You on December 24, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}