diff options
author | stuconnolly <stuart02@gmail.com> | 2010-07-05 21:37:07 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2010-07-05 21:37:07 +0000 |
commit | ee39747795b41551509a11fa770d8a937feb5f39 (patch) | |
tree | 61bd893251378660fec1b490227fadf9419bab02 /Source/SPExportController.m | |
parent | 081cc9ece186c7c097ee51617a73780e2228eeea (diff) | |
download | sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.tar.gz sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.tar.bz2 sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.zip |
Fix the resizing of the export dialog when the sheet is already accommodating all available space. Also, change the cancel button's shortcut to escape. Thanks Hans.
Diffstat (limited to 'Source/SPExportController.m')
-rw-r--r-- | Source/SPExportController.m | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 6cee32b7..e8bbf1a4 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -875,6 +875,13 @@ NSRect frame = [[self window] frame]; + if (frame.size.height > 600 && delta > heightOffset1) { + frame.origin.y += [exportCustomFilenameView frame].size.height; + frame.size.height -= [exportCustomFilenameView frame].size.height; + + [[self window] setFrame:frame display:YES animate:YES]; + } + [exportInputPopUpButton setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; [exportFilePerTableCheck setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; [exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; @@ -924,6 +931,13 @@ NSRect frame = [[self window] frame]; + if (frame.size.height > 600 && delta > heightOffset2) { + frame.origin.y += [exportAdvancedOptionsView frame].size.height; + frame.size.height -= [exportAdvancedOptionsView frame].size.height; + + [[self window] setFrame:frame display:YES animate:YES]; + } + [exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; [exportTableListButtonBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; [exportTypeTabBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; |