Fixes #304

bakerma07 · Aug 1, 2012 · 3898858 · 3898858
1 parent dc0a8d8
commit 3898858
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/Classes/Controllers/TXMasterController.m b/Classes/Controllers/TXMasterController.m
@@ -88,7 +88,7 @@ - (void)awakeFromNib
 	self.viewTheme		= [TPCViewTheme new];
 	self.viewTheme.name = [TPCPreferences themeName];
 
-	[self loadWindowState];
+	[self loadWindowState:YES];
 
 	[self.window setAlphaValue:[TPCPreferences themeTransparency]];
 
@@ -397,7 +397,7 @@ - (void)windowDidEnterFullScreen:(NSNotification *)notification
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification
 {
-	[self loadWindowState];
+	[self loadWindowState:NO];
 
 	self.menu.isInFullScreenMode = NO;
 }
@@ -554,6 +554,11 @@ - (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview
 }
 
 - (void)loadWindowState
+{
+	[self loadWindowState:NO];
+}
+
+- (void)loadWindowState:(BOOL)honorFullscreen
 {
 	NSDictionary *dic = [TPCPreferences loadWindowStateWithName:@"Window -> Main Window"];
 
@@ -562,6 +567,8 @@ - (void)loadWindowState
 		NSInteger y = [dic integerForKey:@"y"];
 		NSInteger w = [dic integerForKey:@"w"];
 		NSInteger h = [dic integerForKey:@"h"];
+
+		BOOL fullscreen = [dic boolForKey:@"fullscreen"];
 
 		[self.window setFrame:NSMakeRect(x, y, w, h) display:YES animate:self.menu.isInFullScreenMode];
 
@@ -579,6 +586,10 @@ - (void)loadWindowState
 		if (self.memberSplitView.position < _minimumSplitViewWidth) {
 			self.memberSplitView.position = _defaultSplitViewWidth;
 		}
+
+		if (fullscreen && honorFullscreen) {
+			[self.menu performSelector:@selector(toggleFullscreenMode:) withObject:nil afterDelay:2.0];
+		}
 	} else {
 		NSScreen *screen = [NSScreen mainScreen];
 
@@ -606,8 +617,10 @@ - (void)loadWindowState
 - (void)saveWindowState
 {
 	NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-
-	if (self.menu.isInFullScreenMode) {
+
+	BOOL fullscreen = self.menu.isInFullScreenMode;
+
+	if (fullscreen) {
 		[self.menu toggleFullscreenMode:nil];
 	}
 
@@ -632,6 +645,8 @@ - (void)saveWindowState
 
 	[dic setInteger:self.serverSplitView.position forKey:@"serverList"];
 	[dic setInteger:self.memberSplitView.position forKey:@"memberList"];
+
+	[dic setBool:fullscreen forKey:@"fullscreen"];
 
 	[_NSUserDefaults() setBool:[self.text isGrammarCheckingEnabled]				forKey:@"TextFieldAutomaticGrammarCheck"];
 	[_NSUserDefaults() setBool:[self.text isContinuousSpellCheckingEnabled]		forKey:@"TextFieldAutomaticSpellCheck"];

diff --git a/Classes/Controllers/TXMenuController.m b/Classes/Controllers/TXMenuController.m
@@ -1693,7 +1693,7 @@ - (void)toggleFullscreenMode:(id)sender
 		if (self.isInFullScreenMode) {
 			[self.window toggleFullScreen:sender];
 
-			[self.master loadWindowState];
+			[self.master loadWindowState:NO];
 		} else {
 			[self.master saveWindowState];
 
@@ -1721,7 +1721,7 @@ - (void)toggleFullscreenMode:(id)sender
 			[[self.window standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
 
 			[self.window setShowsResizeIndicator:YES];
-			[self.master loadWindowState];
+			[self.master loadWindowState:NO];
 
 			[NSApp setPresentationOptions:NSApplicationPresentationDefault];
 		}

diff --git a/Classes/Headers/TXMasterController.h b/Classes/Headers/TXMasterController.h
@@ -68,7 +68,9 @@
 @property (nonatomic, strong) TLONickCompletionStatus *completionStatus;
 @property (nonatomic, assign) NSInteger memberSplitViewOldPosition;
 
-- (void)loadWindowState;
+
+- (void)loadWindowState TEXTUAL_DEPRECATED;
+- (void)loadWindowState:(BOOL)honorFullscreen;
 - (void)saveWindowState;
 - (void)showMemberListSplitView:(BOOL)showList;
 

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>12175</string>
+	<string>12187</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-269-g942f7ff-debug</string>
+	<string>2.1.1-270-gdc0a8d8-appstore</string>
 </dict>
 </plist>