darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2025-04-05 08:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drawer content position adjustments

Browse Source
This commit is contained in:
Dr. Rolf Jansen 2011-02-20 21:18:15 -03:00
parent b5d043c0aa
commit 7f53ff8ec7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AppKit/NSDrawer.subproj/NSDrawer.m
View File

@ -39,13 +39,13 @@ NSString * const NSDrawerDidCloseNotification = @"NSDrawerDidCloseNotification";
drawerFrame = [NSWindow frameRectForContentRect:NSMakeRect(0, 0, contentSize.width, contentSize.height) styleMask:NSDrawerWindowMask]; drawerFrame = [NSWindow frameRectForContentRect:NSMakeRect(0, 0, contentSize.width, contentSize.height) styleMask:NSDrawerWindowMask];
if (edge == NSMinXEdge || edge == NSMaxXEdge) { if (edge == NSMinXEdge || edge == NSMaxXEdge) {
drawerFrame.origin.x = parentFrame.origin.x; drawerFrame.origin.x = parentFrame.origin.x - 12.0;
drawerFrame.origin.y = parentContentRect.origin.y + trailingOffset; drawerFrame.origin.y = parentContentRect.origin.y + trailingOffset - 12.0;
drawerFrame.size.height = parentContentRect.size.height - (leadingOffset + trailingOffset); drawerFrame.size.height = parentContentRect.size.height - (leadingOffset + trailingOffset);
} }
else { else {
drawerFrame.origin.x = parentContentRect.origin.x + leadingOffset; drawerFrame.origin.x = parentContentRect.origin.x + leadingOffset - 12.0;
drawerFrame.origin.y = parentContentRect.origin.y; drawerFrame.origin.y = parentContentRect.origin.y - 12.0;
drawerFrame.size.width = parentContentRect.size.width - (leadingOffset + trailingOffset); drawerFrame.size.width = parentContentRect.size.width - (leadingOffset + trailingOffset);
} }
@ -164,12 +164,20 @@ NSString * const NSDrawerDidCloseNotification = @"NSDrawerDidCloseNotification";
_delegate = nil; _delegate = nil;
if([keyed containsValueForKey:@"NSMinContentSize"]) if([keyed containsValueForKey:@"NSMinContentSize"])
{
[self setMinContentSize:[keyed decodeSizeForKey:@"NSMinContentSize"]]; [self setMinContentSize:[keyed decodeSizeForKey:@"NSMinContentSize"]];
_minContentSize.width += 12.0;
_minContentSize.height += 12.0;
}
else else
_minContentSize = NSZeroSize; _minContentSize = NSZeroSize;
if([keyed containsValueForKey:@"NSMaxContentSize"]) if([keyed containsValueForKey:@"NSMaxContentSize"])
{
[self setMaxContentSize:[keyed decodeSizeForKey:@"NSMaxContentSize"]]; [self setMaxContentSize:[keyed decodeSizeForKey:@"NSMaxContentSize"]];
_maxContentSize.width += 12.0;
_maxContentSize.height += 12.0;
}
else else
_maxContentSize = NSZeroSize; _maxContentSize = NSZeroSize;
} }