gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 02:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:gnustep/libs-gui into NSSpeechRecognizer_branch

Browse source
This commit is contained in:
Gregory John Casamento 2020-02-10 03:03:20 -05:00
commit 5b96ad6692
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2020-02-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSFontDescriptor.m: Correct key for encoding and decoding.
2020-01-31 Sergii Stoian <stoyan255@gmail.com>
* Source/GSTitleView.m (mouseDown:): limit menu movement to screen

3
Source/GSXib5KeyedUnarchiver.m
View file

@ -2401,7 +2401,8 @@ didStartElement: (NSString*)elementName
mask.flags.highlighted = [[attributes objectForKey: @"highlighted"] boolValue];
mask.flags.disabled = ([attributes objectForKey: @"enabled"] ?
[[attributes objectForKey: @"enabled"] boolValue] == NO : NO);
mask.flags.editable = [[attributes objectForKey: @"editable"] boolValue];
mask.flags.editable = ([attributes objectForKey: @"editable"] ?
[[attributes objectForKey: @"editable"] boolValue] : YES);
mask.flags.vCentered = [[attributes objectForKey: @"alignment"] isEqualToString: @"center"];
mask.flags.hCentered = [[attributes objectForKey: @"alignment"] isEqualToString: @"center"];
mask.flags.bordered = [[borderStyle lowercaseString] containsString: @"border"];

4
Source/NSFontDescriptor.m
View file

@ -155,7 +155,7 @@
{
if ([aCoder allowsKeyedCoding])
{
[aCoder encodeObject: _attributes forKey: @"NSAttributes"];
[aCoder encodeObject: _attributes forKey: @"NSFontDescriptorAttributes"];
}
else
{
@ -167,7 +167,7 @@
{
if ([aDecoder allowsKeyedCoding])
{
_attributes = RETAIN([aDecoder decodeObjectForKey: @"NSAttributes"]);
_attributes = RETAIN([aDecoder decodeObjectForKey: @"NSFontDescriptorAttributes"]);
}
else
{