Implement -[CPWindowController setViewControllerContainerView:], fix -[CPWindowController setViewControllerView:]

Container view is responsible for laying out its views.
Container view is a content view of the window.
If there is no container view, view controller's view is a content view of the window.
This commit is contained in:
Ilya Kulakov authored and Alexander Ljungberg committed 2012-07-06 16:03:29 +01:00
1 parent 552ba68187
commit 88f8581dcc
1 file changed
+65 -13
+65 -13
View File
@@ -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.
@@ -333,6 +333,36 @@
- (void)setViewControllerContainerView:(CPView)aView
{
if (!_viewControllerContainerView && !aView)
return;
var viewController = [self viewController],
contentView = [[self window] contentView];
if (aView)
{
[aView setFrame:[contentView frame]];
[aView setAutoresizingMask:[contentView autoresizingMask]];
if (viewController)
{
[[viewController view] removeFromSuperview];
[aView addSubview:[viewController view]];
}
[[self window] setContentView:aView];
}
else if (viewController)
{
[[viewController view] removeFromSuperview];
[[viewController view] setFrame:[contentView frame]];
[[viewController view] setAutoresizingMask:[contentView autoresizingMask]]
[[self window] setContentView:[viewController view]];
}
else
{
var view = [[CPView alloc] init];
[view setFrame:[contentView frame]];
[view setAutoresizingMask:[contentView autoresizingMask]];
[[self window] setContentView:view]
}
_viewControllerContainerView = aView;
}
@@ -343,21 +373,43 @@
- (void)setViewController:(CPViewController)aViewController
{
var containerView = [self viewControllerContainerView] || [[self window] contentView],
view = [_viewController view],
frame = view ? [view frame] : [containerView bounds];
if (!_viewController && !aViewController)
return;
[view removeFromSuperview];
_viewController = aViewController;
view = [_viewController view];
if (view)
var containerView = [self viewControllerContainerView],
newView = [aViewController view];
if (containerView)
{
[view setFrame:frame];
[containerView addSubview:view];
var oldView = [_viewController view];
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]
}
_viewController = aViewController;
}
- (CPViewController)viewController