From: masakih <masakih@users.sourceforge.jp>
Date: Fri, 4 Dec 2015 14:06:45 +0000 (+0900)
Subject: 簡略表示時は連合艦隊ビューを表示しないように修正
X-Git-Tag: 1.4b1~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8340e9df12b121ae1d3e7d467f751be6abada810;p=kcd%2FKCD.git

簡略表示時は連合艦隊ビューを表示しないように修正
---

diff --git a/KCD/HMBroserWindowController.m b/KCD/HMBroserWindowController.m
index c5f976d0..a0ea6101 100644
--- a/KCD/HMBroserWindowController.m
+++ b/KCD/HMBroserWindowController.m
@@ -353,6 +353,8 @@ static NSString *loginPageURLPrefix = @"https://www.dmm.com/my/-/login/=/";
 - (void)showCombinedView
 {
 	if(self.isCombinedMode) return;
+	if(self.fleetViewPosition == kOldStyle) return;
+	
 	self.isCombinedMode = YES;
 	
 	if(!self.combinedViewController) {
@@ -426,6 +428,10 @@ const CGFloat flashTopMargin = 4;
 	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];
@@ -436,6 +442,7 @@ const CGFloat flashTopMargin = 4;
 	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;
@@ -703,6 +710,7 @@ const CGFloat flashTopMargin = 4;
 		} else {
 			menuItem.title = NSLocalizedString(@"Show Combined View", @"View menu, show combined view");
 		}
+		if(self.fleetViewPosition == kOldStyle) return NO;
 		return YES;
 	}