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

Do not re-use busy HTML output views/windows

Browse Source 
Additionally, we only re-use a window when the command is the same as what was last associated with the window. So doing a documentation lookup and then building the project will not re-use the (non-busy) documentation window for the build progress.

Closes #733
This commit is contained in:
Allan Odgaard
2014-03-09 09:55:56 +07:00
parent ee405e740f
commit 69453cd1fc
1 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1766,7 +1766,7 @@ namespace
- (BOOL)htmlOutputVisible
{
return self.layoutView.htmlOutputView || [self.htmlOutputWindowController.window isVisible];
return self.htmlOutputInWindow ? [self.htmlOutputWindowController.window isVisible] : self.layoutView.htmlOutputView != nil;
}
- (void)setHtmlOutputVisible:(BOOL)makeVisibleFlag
@@ -1792,8 +1792,9 @@ namespace
if(self.layoutView.htmlOutputView && [[self.window firstResponder] isKindOfClass:[NSView class]] && [(NSView*)[self.window firstResponder] isDescendantOf:self.layoutView.htmlOutputView])
[self makeTextViewFirstResponder:self];
[self.htmlOutputWindowController.window orderOut:self];
self.layoutView.htmlOutputView = nil;
if(self.layoutView.htmlOutputView)
self.layoutView.htmlOutputView = nil;
else [self.htmlOutputWindowController.window orderOut:self];
}
}
@@ -1822,25 +1823,40 @@ namespace
- (BOOL)setCommandRunner:(command::runner_ptr const&)aRunner
{
if(self.htmlOutputInWindow)
_runner = aRunner;
if(self.htmlOutputInWindow || self.htmlOutputView.runningCommand)
{
_runner = aRunner;
HTMLOutputWindowController* target = nil;
if(!self.htmlOutputWindowController || [self.htmlOutputWindowController running] || self.htmlOutputWindowController.needsNewWebView)
self.htmlOutputWindowController = [HTMLOutputWindowController HTMLOutputWindowWithRunner:_runner];
else [self.htmlOutputWindowController setCommandRunner:_runner];
HTMLOutputWindowController* candidate = self.htmlOutputWindowController;
if(candidate && !candidate.running && candidate.commandRunner->uuid() == _runner->uuid() && !candidate.needsNewWebView)
{
target = candidate;
}
else
{
for(NSWindow* window in [NSApp orderedWindows])
{
HTMLOutputWindowController* candidate = [window delegate];
if(![window isMiniaturized] && [window isVisible] && [candidate isKindOfClass:[HTMLOutputWindowController class]])
{
if(candidate && !candidate.running && candidate.commandRunner->uuid() == _runner->uuid() && !candidate.needsNewWebView)
{
target = candidate;
break;
}
}
}
}
if(!target)
target = [HTMLOutputWindowController new];
target.commandRunner = _runner;
self.htmlOutputWindowController = target;
}
else
{
if(_runner && _runner->running())
{
NSInteger choice = [[NSAlert alertWithMessageText:@"Stop current task first?" defaultButton:@"Stop Task" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@"There already is a task running. If you stop this then the task it is performing will not be completed."] runModal];
if(choice != NSAlertDefaultReturn) /* "Stop" */
return NO;
}
_runner = aRunner;
self.htmlOutputVisible = YES;
[self.window makeFirstResponder:self.htmlOutputView.webView];
[self.htmlOutputView loadRequest:URLRequestForCommandRunner(_runner) environment:_runner->environment() autoScrolls:_runner->auto_scroll_output()];