From 145bf655420b3c045110f4bff7b0d61938b2b3c8 Mon Sep 17 00:00:00 2001 From: Didier Korthoudt Date: Mon, 21 Mar 2022 14:10:53 +0100 Subject: [PATCH] Fixed: Before this PR, outlet connection decoding was done before views are ready (#2959) --- AppKit/Cib/_CPCibObjectData.j | 4 +++- Tools/nib2cib/NSIBObjectData.j | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AppKit/Cib/_CPCibObjectData.j b/AppKit/Cib/_CPCibObjectData.j index b240bcaa0..9cc8c99d5 100644 --- a/AppKit/Cib/_CPCibObjectData.j +++ b/AppKit/Cib/_CPCibObjectData.j @@ -31,6 +31,7 @@ @import "CPCibOutletConnector.j" @import "CPCibRuntimeAttributesConnector.j" @import "CPClipView.j" +@import "_CPCibCustomObject.j" @class CPScrollView @@ -163,7 +164,6 @@ var _CPCibObjectDataNamesKeysKey = @"_CPCibObjectDataNamesKeysKey _classesKeys = [aCoder decodeObjectForKey:_CPCibObjectDataClassesKeysKey]; _classesValues = [aCoder decodeObjectForKey:_CPCibObjectDataClassesValuesKey]; - _connections = [aCoder decodeObjectForKey:_CPCibObjectDataConnectionsKey]; //id _fontManager; _framework = [aCoder decodeObjectForKey:_CPCibObjectDataFrameworkKey]; @@ -179,6 +179,8 @@ var _CPCibObjectDataNamesKeysKey = @"_CPCibObjectDataNamesKeysKey _fileOwner = [aCoder decodeObjectForKey:_CPCibObjectDataFileOwnerKey]; _visibleWindows = [aCoder decodeObjectForKey:_CPCibObjectDataVisibleWindowsKey]; + + _connections = [aCoder decodeObjectForKey:_CPCibObjectDataConnectionsKey]; } return self; diff --git a/Tools/nib2cib/NSIBObjectData.j b/Tools/nib2cib/NSIBObjectData.j index 94c2c7025..6b8289672 100644 --- a/Tools/nib2cib/NSIBObjectData.j +++ b/Tools/nib2cib/NSIBObjectData.j @@ -50,8 +50,6 @@ _classesKeys = [aCoder decodeObjectForKey:@"NSClassesKeys"]; _classesValues = [aCoder decodeObjectForKey:@"NSClassesValues"]; - _connections = [aCoder decodeObjectForKey:@"NSConnections"]; - //_fontManager = [aCoder decodeObjectForKey:@"NSFontManager"] retain]; _framework = [aCoder decodeObjectForKey:@"NSFramework"]; @@ -67,6 +65,8 @@ _fileOwner = [aCoder decodeObjectForKey:@"NSRoot"]; _visibleWindows = [aCoder decodeObjectForKey:@"NSVisibleWindows"]; + + _connections = [aCoder decodeObjectForKey:@"NSConnections"]; } return self;