diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index 8022dad0e..33d243f22 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -144,12 +144,11 @@ var CPSplitViewHorizontalImage = nil, { if (_isPaneSplitter == shouldBePaneSplitter) return; - + _isPaneSplitter = shouldBePaneSplitter; -#if PLATFORM(DOM) - _DOMDividerElements = []; -#endif + if(_DOMDividerElements[_drawingDivider]) + [self _setupDOMDivider] // The divider changes size when pane splitter mode is toggled, so the // subviews need to change size too. @@ -160,7 +159,6 @@ var CPSplitViewHorizontalImage = nil, - (void)didAddSubview:(CPView)aSubview { _needsResizeSubviews = YES; -// [self adjustSubviews]; } - (BOOL)isSubviewCollapsed:(CPView)subview @@ -216,16 +214,7 @@ var CPSplitViewHorizontalImage = nil, CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]); - if (_isPaneSplitter) - { - _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5"; - _DOMDividerElements[_drawingDivider].style.backgroundImage = ""; - } - else - { - _DOMDividerElements[_drawingDivider].style.backgroundColor = ""; - _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')"; - } + [self _setupDOMDivider]; } CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect)); @@ -233,6 +222,20 @@ var CPSplitViewHorizontalImage = nil, #endif } +- (void)_setupDOMDivider +{ + if (_isPaneSplitter) + { + _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5"; + _DOMDividerElements[_drawingDivider].style.backgroundImage = ""; + } + else + { + _DOMDividerElements[_drawingDivider].style.backgroundColor = ""; + _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')"; + } +} + - (void)viewWillDraw { [self _adjustSubviewsWithCalculatedSize]; @@ -515,8 +518,6 @@ var CPSplitViewHorizontalImage = nil, } else if (totalSizableSpace && !isSizable) viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent]; - else - alert("SHOULD NEVER GET HERE"); bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;