diff options
| -rw-r--r-- | Interfaces/English.lproj/DBView.xib | 12 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.m | 17 |
2 files changed, 27 insertions, 2 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index b1d29f13..e832ed0e 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,7 +23,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="7168"/> + <integer value="675"/> <integer value="6493"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -16141,6 +16141,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <int key="connectionID">7205</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sidebarGrabber</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="28219887"/> + </object> + <int key="connectionID">7206</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -25957,7 +25965,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">7205</int> + <int key="maxID">7206</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 3c83f611..a323d7d3 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -232,6 +232,9 @@ [taskProgressWindow setBackgroundColor:[NSColor clearColor]]; [taskProgressWindow setAlphaValue:0.0]; [taskProgressWindow setContentView:taskProgressLayer]; + + [contentViewSplitter setDelegate:self]; + } /** @@ -4446,6 +4449,16 @@ #pragma mark - #pragma mark SplitView delegate methods +- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex +{ + + // Limit the right view of DBViewSplitter in order to avoid GUI element overlapping + if(splitView == contentViewSplitter) return proposedMax - 470; + + return proposedMax; + +} + /** * tells the splitView that it can collapse views */ @@ -4456,7 +4469,11 @@ - (void)splitViewDidResizeSubviews:(NSNotification *)notification { + // Fix tablesList search field frame after collapsing the tablesList + [listFilterField setFrameSize:NSMakeSize([[[contentViewSplitter subviews] objectAtIndex:0] frame].size.width - 8, [listFilterField frame].size.height)]; + [self updateChooseDatabaseToolbarItemWidth]; + } - (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex |