Author: mlytwyn
Date: Fri Mar 24 20:11:54 2017
New Revision: 40414
URL: http://svn.gna.org/viewcvs/gnustep?rev=40414&view=rev
Log:
Extract autorecalculates key view loop bit for NSWindow from XIB
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSNibLoading.h
libs/gui/branches/gnustep_testplant_branch/Source/GSNibLoading.m
libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSNibLoading.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSNibLoading.h?rev=40414&r1=40413&r2=40414&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSNibLoading.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSNibLoading.h
Fri Mar 24 20:11:54 2017
@@ -79,9 +79,11 @@
unsigned int style:2;
unsigned int _unused2:3;
unsigned int isNotShadowed:1;
- unsigned int _unused:12; // currently not used, contains Cocoa specific info
+ unsigned int autorecalculatesKeyViewLoop:1;
+ unsigned int _unused:11; // currently not used, contains Cocoa specific info
#else
- unsigned int _unused:12; // currently not used, contains Cocoa specific info
+ unsigned int _unused:11; // currently not used, contains Cocoa specific info
+ unsigned int autorecalculatesKeyViewLoop:1;
unsigned int isNotShadowed:1;
unsigned int _unused2:3;
unsigned int style:2;
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSNibLoading.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSNibLoading.m?rev=40414&r1=40413&r2=40414&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSNibLoading.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSNibLoading.m Fri Mar
24 20:11:54 2017
@@ -332,6 +332,7 @@
_flags.dynamicDepthLimit = [window hasDynamicDepthLimit];
_flags.autoPositionMask = autoPositionMask;
_flags.savePosition = YES; // not yet implemented.
+ _flags.autorecalculatesKeyViewLoop = [window
autorecalculatesKeyViewLoop];
}
}
return self;
@@ -495,6 +496,7 @@
[_realObject setDynamicDepthLimit: _flags.dynamicDepthLimit];
// [_realObject setFrameAutosaveName: _autosaveName]; // done after
setting the min/max sizes
[_realObject setHasShadow: !_flags.isNotShadowed];
+ [_realObject setAutorecalculatesKeyViewLoop:
_flags.autorecalculatesKeyViewLoop];
// reset attributes...
[_realObject setContentView: _view];
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m?rev=40414&r1=40413&r2=40414&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
Fri Mar 24 20:11:54 2017
@@ -937,6 +937,7 @@
GSWindowTemplateFlagsUnion mask = { { 0 } };
GSXib5Element *winPosMaskEleme =
(GSXib5Element*)[currentElement elementForKey: @"initialPositionMask"];
NSUInteger winPosMask = [[self
decodeWindowPositionMaskForElement:winPosMaskEleme] unsignedIntegerValue];
+ NSString *autorecalculatesKeyViewLoop = [element
attributeForKey: @"autorecalculatesKeyViewLoop"];
mask.flags.isHiddenOnDeactivate = [[attributes objectForKey:
@"hidesOnDeactivate"] boolValue];
mask.flags.isNotReleasedOnClose = !([attributes objectForKey:
@"releasedWhenClosed"] ?
@@ -955,6 +956,7 @@
mask.flags.style = 0; // ???
mask.flags.isNotShadowed = !([attributes objectForKey:
@"hasShadow"] ?
[[attributes objectForKey:
@"hasShadow"] boolValue] : YES);
+ mask.flags.autorecalculatesKeyViewLoop = (autorecalculatesKeyViewLoop ?
[autorecalculatesKeyViewLoop boolValue] : YES);
// File GSNibLoading.m: 422. In -[NSWindowTemplate initWithCoder:] _flags:
0xf0781400 style: 147 backing: 2
// File GSNibLoading.m: 422. In -[NSWindowTemplate initWithCoder:] _flags:
0xf0001000 style: 147 backing: 2
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
