trunk/src/osd/modules/debugger/osx/debugconsole.m
| r245568 | r245569 | |
|---|
| 132 | 132 | [window makeFirstResponder:commandField]; |
| 133 | 133 | |
| 134 | 134 | // calculate the optimal size for everything |
| 135 | | NSRect available = [[NSScreen mainScreen] visibleFrame]; |
| 136 | | NSRect windowFrame = [window frame]; |
| 137 | | NSSize regCurrent = [regScroll frame].size; |
| 138 | | NSSize regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize] |
| 139 | | hasHorizontalScroller:YES |
| 140 | | hasVerticalScroller:YES |
| 141 | | borderType:[regScroll borderType]]; |
| 142 | | NSSize dasmCurrent = [dasmScroll frame].size; |
| 143 | | NSSize dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize] |
| 144 | | hasHorizontalScroller:YES |
| 145 | | hasVerticalScroller:YES |
| 146 | | borderType:[dasmScroll borderType]]; |
| 147 | | NSSize consoleCurrent = [consoleContainer frame].size; |
| 148 | | NSSize consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize] |
| 149 | | hasHorizontalScroller:YES |
| 150 | | hasVerticalScroller:YES |
| 151 | | borderType:[consoleScroll borderType]]; |
| 152 | | NSSize adjustment; |
| 135 | NSRect const available = [[NSScreen mainScreen] visibleFrame]; |
| 136 | NSSize const regCurrent = [regScroll frame].size; |
| 137 | NSSize const regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize] |
| 138 | hasHorizontalScroller:YES |
| 139 | hasVerticalScroller:YES |
| 140 | borderType:[regScroll borderType]]; |
| 141 | NSSize const dasmCurrent = [dasmScroll frame].size; |
| 142 | NSSize const dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize] |
| 143 | hasHorizontalScroller:YES |
| 144 | hasVerticalScroller:YES |
| 145 | borderType:[dasmScroll borderType]]; |
| 146 | NSSize const consoleCurrent = [consoleContainer frame].size; |
| 147 | NSSize consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize] |
| 148 | hasHorizontalScroller:YES |
| 149 | hasVerticalScroller:YES |
| 150 | borderType:[consoleScroll borderType]]; |
| 151 | NSRect windowFrame = [window frame]; |
| 152 | NSSize adjustment; |
| 153 | 153 | |
| 154 | 154 | consoleSize.width += consoleCurrent.width - [consoleScroll frame].size.width; |
| 155 | 155 | consoleSize.height += consoleCurrent.height - [consoleScroll frame].size.height; |
trunk/src/osd/sdl/aueffectutil.m
| r245568 | r245569 | |
|---|
| 306 | 306 | |
| 307 | 307 | [self loadEffectUI]; |
| 308 | 308 | if (nil != restoreFrame) |
| 309 | { |
| 309 | 310 | [window setFrameFromString:restoreFrame]; |
| 311 | } |
| 312 | else |
| 313 | { |
| 314 | NSRect const available = [[NSScreen mainScreen] visibleFrame]; |
| 315 | NSRect frame = [window frame]; |
| 316 | frame.origin.x = (NSWidth(available) - NSWidth(frame)) / 4; |
| 317 | frame.origin.y = (NSHeight(available) - NSHeight(frame)) * 3 / 4; |
| 318 | [window setFrame:frame display:YES animate:NO]; |
| 319 | } |
| 310 | 320 | } |
| 311 | 321 | |
| 312 | 322 | - (BOOL)readFromData:(NSData *)data ofType:(NSString *)type error:(NSError **)error { |
| r245568 | r245569 | |
|---|
| 836 | 846 | item = [parent addItemWithTitle:@"Help" action:NULL keyEquivalent:@""]; |
| 837 | 847 | [parent setSubmenu:menu forItem:item]; |
| 838 | 848 | [menu release]; |
| 839 | | [NSApp setHelpMenu:menu]; |
| 849 | [menu setValue:@"NSHelpMenu" forKey:@"name"]; |
| 850 | if ([NSApp respondsToSelector:@selector(setHelpMenu:)]) |
| 851 | [NSApp performSelector:@selector(setHelpMenu:) withObject:menu]; |
| 840 | 852 | |
| 841 | 853 | item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ Help", appName] action:@selector(showHelp:) keyEquivalent:@"?"]; |
| 842 | 854 | } |