github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use NSWindow’s stringWithSavedFrame instead of window.frame

Browse Source 
This includes the screen dimension so that restoring the frame on a different screen can scale the window accordingly.
This commit is contained in:
Allan Odgaard
2014-04-25 14:27:59 +07:00
parent 0ad0b12a82
commit 7c31761e21
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -2336,7 +2336,11 @@ static NSUInteger DisableSessionSavingCount = 0;
DocumentController* controller = [DocumentController new];
[controller setupControllerForProject:project skipMissingFiles:NO];
if(NSString* windowFrame = project[@"windowFrame"])
[controller.window setFrame:NSRectFromString(windowFrame) display:NO];
{
if([windowFrame hasPrefix:@"{"]) // Legacy NSRect
[controller.window setFrame:NSRectFromString(windowFrame) display:NO];
else [controller.window setFrameFromString:windowFrame];
}
[controller showWindow:nil];
if([project[@"miniaturized"] boolValue])
[controller.window miniaturize:nil];
@@ -2407,7 +2411,7 @@ static NSUInteger DisableSessionSavingCount = 0;
if(([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask)
res[@"fullScreen"] = @YES;
else res[@"windowFrame"] = NSStringFromRect([self.window frame]);
else res[@"windowFrame"] = [self.window stringWithSavedFrame];
res[@"miniaturized"] = @([self.window isMiniaturized]);
res[@"htmlOutputSize"] = NSStringFromSize(self.htmlOutputSize);