gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 19:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix encoding/decoding of matrixExplicitlySet.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14466 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2002-09-16 18:23:13 +00:00
parent 352ae1bc9a
commit 12644d7d71
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2002-09-16 19:28 Alexander Malmberg <alexander@malmberg.org>
* Source/NSFont (+initialize, -initWithCoder:, -encodeWithCoder:):
Encode and decode matrixExplicitlySet, and guess its value when
loading old encoded objects.
2002-09-16 19:05 Alexander Malmberg <alexander@malmberg.org> 2002-09-16 19:05 Alexander Malmberg <alexander@malmberg.org>
* Source/NSWindow.m (-close): Retain and release self to make sure * Source/NSWindow.m (-close): Retain and release self to make sure

22
Source/NSFont.m
View file

@ -165,6 +165,8 @@ setNSFont(NSString* key, NSFont* font)
{ {
defaults = RETAIN([NSUserDefaults standardUserDefaults]); defaults = RETAIN([NSUserDefaults standardUserDefaults]);
} }
[self setVersion: 2];
} }
} }
@ -771,16 +773,34 @@ setNSFont(NSString* key, NSFont* font)
{ {
[aCoder encodeObject: fontName]; [aCoder encodeObject: fontName];
[aCoder encodeArrayOfObjCType: @encode(float) count: 6 at: matrix]; [aCoder encodeArrayOfObjCType: @encode(float) count: 6 at: matrix];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &matrixExplicitlySet];
} }
- (id) initWithCoder: (NSCoder*)aDecoder - (id) initWithCoder: (NSCoder*)aDecoder
{ {
int version = [aDecoder versionForClassName:
@"NSFont"];
id name; id name;
float fontMatrix[6]; float fontMatrix[6];
name = [aDecoder decodeObject]; name = [aDecoder decodeObject];
[aDecoder decodeArrayOfObjCType: @encode(float) count: 6 at: fontMatrix]; [aDecoder decodeArrayOfObjCType: @encode(float) count: 6 at: fontMatrix];
return [self initWithName: name matrix: fontMatrix]; self = [self initWithName: name matrix: fontMatrix];
if (version == 2)
{
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &matrixExplicitlySet];
}
else
{
if (fontMatrix[0] == fontMatrix[3]
&& fontMatrix[1]==0.0
&& fontMatrix[2]==0.0)
{
matrixExplicitlySet = NO;
}
}
return self;
} }
@end /* NSFont */ @end /* NSFont */