colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-28 10:58:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in NSWindowTemplate.j where using a non existing ivar

Browse Source
This commit is contained in:
Antoine Mercadal committed 2013-01-18 14:46:49 -08:00
1 parent bbb8bdb687
commit c3d8f4f80b
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
Tools/nib2cib/NSWindowTemplate.j
+5 -2
View File
@@ -59,7 +59,10 @@ var NSBorderlessWindowMask = 0x00,
_viewClass = [aCoder decodeObjectForKey:@"NSViewClass"]; // references the toolbar if present (anything else?) _viewClass = [aCoder decodeObjectForKey:@"NSViewClass"]; // references the toolbar if present (anything else?)
_wtFlags = [aCoder decodeIntForKey:@"NSWTFlags"]; _wtFlags = [aCoder decodeIntForKey:@"NSWTFlags"];
_windowAutorecalculatesKeyViewLoop = !!(_wtFlags & NSAutorecalculatesKeyViewLoopWTFlag); _windowAutorecalculatesKeyViewLoop = !!(_wtFlags & NSAutorecalculatesKeyViewLoopWTFlag);
_windowBacking = [aCoder decodeIntForKey:@"NSWindowBacking"];
// @TODO: this seems to not be used anywhere, maybe we should safely remove this
// from Antoine the 18 Jan 2013
// _windowBacking = [aCoder decodeIntForKey:@"NSWindowBacking"];
// Convert NSWindows to CPWindows. // Convert NSWindows to CPWindows.
_windowClass = CP_NSMapClassName([aCoder decodeObjectForKey:@"NSWindowClass"]); _windowClass = CP_NSMapClassName([aCoder decodeObjectForKey:@"NSWindowClass"]);
@@ -84,7 +87,7 @@ var NSBorderlessWindowMask = 0x00,
(_windowStyleMask & NSDocModalWindowMask ? CPDocModalWindowMask : 0) | (_windowStyleMask & NSDocModalWindowMask ? CPDocModalWindowMask : 0) |
(_windowStyleMask & NSHUDBackgroundWindowMask ? CPHUDBackgroundWindowMask : 0); (_windowStyleMask & NSHUDBackgroundWindowMask ? CPHUDBackgroundWindowMask : 0);
_windowIsFullBridge = [aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask"; [self setFullBridge:([aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask")];
/*if (![_windowClass isEqualToString:@"NSPanel"]) /*if (![_windowClass isEqualToString:@"NSPanel"])
_windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar _windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar