colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated nib2cib to support new window styles.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2008-12-22 15:10:20 -08:00
parent 459316f102
commit 9fa56531c6
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/nib2cib/NSAppKit.j
+1
View File
@@ -52,6 +52,7 @@ function CP_NSMapClassName(aClassName)
{
case @"NSApplication": return @"CPApplication";
case @"NSObject": return @"CPObject";
case @"NSPanel": return @"CPPanel";
case @"NSView": return @"CPView";
case @"NSWindow": return @"CPWindow";
Tools/nib2cib/NSWindowTemplate.j
+18 -12
View File
@@ -23,6 +23,15 @@
@import <AppKit/_CPCibWindowTemplate.j>
var NSBorderlessWindowMask = 0x00,
NSTitledWindowMask = 0x01,
NSClosableWindowMask = 0x02,
NSMiniaturizableWindowMask = 0x04,
NSResizableWindowMask = 0x08,
NSUtilityWindowMask = 0x10,
NSTexturedBackgroundWindowMask = 0x100,
NSHUDBackgroundWindowMask = 0x2000;
@implementation _CPCibWindowTemplate (NSCoding)
- (id)NS_initWithCoder:(CPCoder)aCoder
@@ -52,18 +61,15 @@
// Flip Y coordinate
_windowRect.origin.y = _screenRect.size.height - _windowRect.origin.y - _windowRect.size.height;
// Only window style so far is CPHUDBackgroundWindowMask
_windowStyleMask |= CPHUDBackgroundWindowMask;
// Adjust size for HUD window - FIXME: in CPWindow.j
if (_windowStyleMask & CPHUDBackgroundWindowMask)
{
CPLog.warn("Adjusting window rect.");
_windowRect.origin.x -= 7.0;
_windowRect.origin.y -= 30.0;
_windowRect.size.width += 14.0;
_windowRect.size.height += 40.0;
}
if (_windowStyleMask === NSBorderlessWindowMask)
_windowStyleMask = CPBorderlessWindowMask;
else
_windowStyleMask = (_windowStyleMask & NSTitledWindowMask ? CPTitledWindowMask : 0) |
(_windowStyleMask & NSMiniaturizableWindowMask ? CPMiniaturizableWindowMask : 0) |
(_windowStyleMask & NSResizableWindowMask ? CPResizableWindowMask : 0) |
(_windowStyleMask & NSTexturedBackgroundWindowMask ? NSTexturedBackgroundWindowMask : 0) |
(_windowStyleMask & NSHUDBackgroundWindowMask ? CPHUDBackgroundWindowMask : 0);
/*if (![_windowClass isEqualToString:@"NSPanel"])
_windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar