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

NSSegmentedCell initWithCoder: fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30171 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2010-04-15 19:46:59 +00:00
parent 7f6a94c5bb
commit 392a9f77b5
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-04-15 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSSegmentedCell.m:
Fix some situations in initWithCoder: where the _selected_segment
ivar and the selected state of items in the _items array could be
out of sync leading to weirdly behaving segmented controls
loaded from nibs.
2010-04-14 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSTextField.m (-textDidEndEditing:): When editing of a

17
Source/NSSegmentedCell.m
View file

@ -638,10 +638,23 @@
if ([aDecoder allowsKeyedCoding])
{
NSUInteger i;
_selected_segment = -1;
if ([aDecoder containsValueForKey: @"NSSegmentImages"])
ASSIGN(_items, [aDecoder decodeObjectForKey: @"NSSegmentImages"]);
else
_items = [[NSMutableArray alloc] initWithCapacity: 2];
for (i=0; i<[_items count]; i++)
{
if ([self isSelectedForSegment: i])
_selected_segment = i;
}
if ([aDecoder containsValueForKey: @"NSSelectedSegment"])
_selected_segment = [aDecoder decodeIntForKey: @"NSSelectedSegment"];
[self setSelectedSegment: [aDecoder decodeIntForKey: @"NSSelectedSegment"]];
_segmentCellFlags._style = [aDecoder decodeIntForKey: @"NSSegmentStyle"];
}
else
@ -649,6 +662,8 @@
int style;
ASSIGN(_items,[aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(int) at: &_selected_segment];
if (_selected_segment != -1)
[self setSelectedSegment: _selected_segment];
[aDecoder decodeValueOfObjCType: @encode(int) at: &style];
_segmentCellFlags._style = style;
}