Permalink
Browse files

Merge branch 'master' of https://github.com/sequelpro/sequelpro

  • Loading branch information...
dmoagx committed Mar 31, 2017
2 parents 5a201e6 + 63eb878 commit 004af0c9d13d5c9f29b3e0e08ee7df025ee56026
Showing with 10 additions and 7 deletions.
  1. +1 −1 Interfaces/English.lproj/ConnectionView.xib
  2. +9 −6 Source/SPDatabaseDocument.m
@@ -2544,7 +2544,7 @@ DQ
<action selector="renameNode:" target="-2" id="5819"/>
</connections>
</menuItem>
<menuItem title="Remove" id="5794">
<menuItem title="Delete" id="5794">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="removeNode:" target="-2" id="5802"/>
@@ -4474,6 +4474,7 @@ - (void)tabDidResize
{
// Coax the main split view into actually checking its constraints
[contentViewSplitter setPosition:[[[contentViewSplitter subviews] objectAtIndex:0] bounds].size.width ofDividerAtIndex:0];
// If the task interface is visible, and this tab is frontmost, re-center the task child window
if (_isWorkingLevel && [parentWindowController selectedTableDocument] == self) [self centerTaskWindow];
}
@@ -4482,17 +4483,19 @@ - (void)tabDidResize
/**
* Set the parent window
*/
- (void)setParentWindow:(NSWindow *)aWindow
- (void)setParentWindow:(NSWindow *)window
{
#ifndef SP_CODA
NSWindow *favoritesOutlineViewWindow = [(NSView *)[connectionController favoritesOutlineView] window];
// If the window is being set for the first time - connection controller is visible - update focus
if (!parentWindow && !mySQLConnection) {
[aWindow makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]];
if (!parentWindow && !mySQLConnection && window == favoritesOutlineViewWindow) {
[window makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]];
}
#endif
parentWindow = aWindow;
parentWindow = window;
SPSSHTunnel *currentTunnel = [connectionController valueForKeyPath:@"sshTunnel"];
if (currentTunnel) [currentTunnel setParentWindow:parentWindow];
}

0 comments on commit 004af0c

Please sign in to comment.