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

Add image position decoding and encoding.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26542 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-05-19 17:42:23 +00:00
parent dc90d0fdfd
commit 155098ecd8
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-05-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSButtonCell.m (-encodeWithCoder:, -initWithCoder:):
Correctly encode and decode image position in the keyed encoding case.
2008-05-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSGraphicsContext.m (-alloc, -allocWithZone:) New

41
Source/NSButtonCell.m
View file

@ -148,14 +148,18 @@ typedef struct _GSButtonCellFlags
- (id) initImageCell: (NSImage*)anImage
{
[super initImageCell: anImage];
self = [super initImageCell: anImage];
if (!self)
return nil;
return [self _init];
}
- (id) initTextCell: (NSString*)aString
{
[super initTextCell: aString];
self = [super initTextCell: aString];
if (!self)
return nil;
return [self _init];
}
@ -1564,7 +1568,15 @@ typedef struct _GSButtonCellFlags
([NSImage imageNamed: @"NSRadioButton"] == image));
buttonCellFlags.isTransparent = [self isTransparent];
buttonCellFlags.isBordered = [self isBordered];
buttonCellFlags.isImageAndText = (image != nil);
buttonCellFlags.imageDoesOverlap =
(_cell.image_position == NSImageOverlaps)
|| (_cell.image_position == NSImageOnly);
buttonCellFlags.isHorizontal = (_cell.image_position == NSImageLeft)
|| (_cell.image_position == NSImageRight);
buttonCellFlags.isBottomOrLeft = (_cell.image_position == NSImageAbove)
|| (_cell.image_position == NSImageBelow);
buttonCellFlags.isImageAndText = (image != nil)
&& (_cell.image_position != NSImageOnly);
buttonCellFlags.hasKeyEquiv = ([self keyEquivalent] != nil);
// cell attributes...
@ -1581,9 +1593,7 @@ typedef struct _GSButtonCellFlags
buttonCellFlags.unused2 = 0; // 255;
buttonCellFlags.lastState = 0;
buttonCellFlags.isImageSizeDiff = 0;
buttonCellFlags.imageDoesOverlap = 0;
buttonCellFlags.drawing = 0;
buttonCellFlags.isBottomOrLeft = 0;
memcpy((void *)&bFlags, (void *)&buttonCellFlags,sizeof(unsigned int));
[aCoder encodeInt: bFlags forKey: @"NSButtonFlags"];
@ -1675,6 +1685,8 @@ typedef struct _GSButtonCellFlags
- (id) initWithCoder: (NSCoder*)aDecoder
{
self = [super initWithCoder: aDecoder];
if (!self)
return nil;
if ([aDecoder allowsKeyedCoding])
{
@ -1718,7 +1730,24 @@ typedef struct _GSButtonCellFlags
[self setCellAttribute: NSChangeGrayCell
to: buttonCellFlags.changeGray];
[self setImagePosition: NSImageLeft];
if (buttonCellFlags.imageDoesOverlap)
if (buttonCellFlags.isImageAndText)
[self setImagePosition: NSImageOverlaps];
else
[self setImagePosition: NSImageOnly];
else if (buttonCellFlags.isImageAndText)
if (buttonCellFlags.isHorizontal)
if (buttonCellFlags.isBottomOrLeft)
[self setImagePosition: NSImageLeft];
else
[self setImagePosition: NSImageRight];
else
if (buttonCellFlags.isBottomOrLeft)
[self setImagePosition: NSImageBelow];
else
[self setImagePosition: NSImageAbove];
else
[self setImagePosition: NSNoImage];
}
if ([aDecoder containsValueForKey: @"NSButtonFlags2"])
{