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

Remember HTML output window frame on a per command basis

Browse Source 
Some commands clearly should not share output window frame, OTOH it might be tedious having to position every new command used (if the default position is undesired).

We should probably re-use last command’s frame if there isn’t already a frame stored for the command (that’s what TextMate 1.x did). It might also be possible to group commands via its semantic class, so all run commands use the same window frame, though currently semantic classes have unique (language) suffixes.
This commit is contained in:
Allan Odgaard
2014-08-30 14:41:07 +02:00
parent 05cf40d77b
commit 5ba236ec67
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
View File

@@ -1,6 +1,5 @@
#import "HTMLOutputWindow.h"
#import <OakAppKit/OakAppKit.h>
#import <OakAppKit/OakWindowFrameHelper.h>
#import <OakFoundation/NSString Additions.h>
#import <OakSystem/process.h>
#import <command/runner.h>
@@ -20,10 +19,12 @@ OAK_DEBUG_VAR(HTMLOutputWindow);
{
if(self = [super init])
{
self.window = [[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 100, 100) styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO];
NSRect rect = [[NSScreen mainScreen] visibleFrame];
rect = NSIntegralRect(NSInsetRect(rect, NSWidth(rect) / 3, NSHeight(rect) / 5));
self.window = [[NSWindow alloc] initWithContentRect:rect styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO];
self.htmlOutputView = [[OakHTMLOutputView alloc] init];
[self.window setFrameAutosaveName:@"Command Output (HTML)"];
[self.window bind:NSTitleBinding toObject:self.htmlOutputView.webView withKeyPath:@"mainFrameTitle" options:nil];
[self.window bind:NSDocumentEditedBinding toObject:self.htmlOutputView withKeyPath:@"runningCommand" options:nil];
[self.window setContentView:self.htmlOutputView];
@@ -36,8 +37,6 @@ OAK_DEBUG_VAR(HTMLOutputWindow);
// Register to application activation/deactivation notification so we can tweak our collection behavior
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidActivate:) name:NSApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidDeactivate:) name:NSApplicationDidResignActiveNotification object:nil];
[OakWindowFrameHelper windowFrameHelperWithWindow:self.window];
}
return self;
}
@@ -76,6 +75,7 @@ OAK_DEBUG_VAR(HTMLOutputWindow);
_commandRunner = aRunner;
self.window.title = [NSString stringWithCxxString:_commandRunner->name()];
self.window.frameAutosaveName = [NSString stringWithFormat:@"HTML output for %@", [NSString stringWithCxxString:_commandRunner->uuid()]];
[self.htmlOutputView loadRequest:URLRequestForCommandRunner(_commandRunner) environment:_commandRunner->environment() autoScrolls:_commandRunner->auto_scroll_output()];
[self showWindow:self];
}