- (void)showCombinedView
{
if(self.isCombinedMode) return;
+ if(self.fleetViewPosition == kOldStyle) return;
+
self.isCombinedMode = YES;
if(!self.combinedViewController) {
if(self.fleetViewPosition == fleetViewPosition) return;
if(self.fleetViewPosition != kOldStyle && fleetViewPosition != kOldStyle) return;
+ if(fleetViewPosition == kOldStyle && self.isCombinedMode) {
+ [self hideCombinedView];
+ }
+
HMFleetViewType type = fleetViewPosition == kOldStyle ? minimumViewType : detailViewType;
HMFleetViewController *newController = [HMFleetViewController viewControlerWithViewType:type];
NSRect newFrame = newController.view.frame;
newFrame.origin = currentView.frame.origin;
newController.view.frame = newFrame;
+ newController.view.autoresizingMask = currentView.autoresizingMask;
[currentView.superview replaceSubview:currentView with:newController.view];
self.fleetViewController = newController;
} else {
menuItem.title = NSLocalizedString(@"Show Combined View", @"View menu, show combined view");
}
+ if(self.fleetViewPosition == kOldStyle) return NO;
return YES;
}