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

Set values for minSize, maxSize, horizontallyResizable and verticallyResizable

Browse source 
in the initializers consistently.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28132 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-03-25 08:14:30 +00:00
parent 1a50756c33
commit 48f6a535ad
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2009-03-25 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView.m (-initWithFrame:textContainer:,
-initWithCoder:): Set values for minSize, maxSize,
horizontallyResizable and verticallyResizable consistently.
* Source/NSTextView.m (-encodeWithCoder:) : Release the temporary
shared data object.
2009-03-23 12:13-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSSpeechSynthesizer.[hm]: Add code to tell the developer

31
Source/NSTextView.m
View file

@ -637,8 +637,8 @@ If a text view is added to an empty text network, it keeps its attributes.
if (!did_register_for_services)
[isa registerForServices];
_minSize = NSMakeSize(0, 0);
_maxSize = NSMakeSize(HUGE,HUGE);
_minSize = frameRect.size;
_maxSize = NSMakeSize(frameRect.size.width, HUGE);
_textContainerInset = NSMakeSize(2, 0);
ASSIGN(_insertionPointColor, [NSColor textColor]);
@ -651,7 +651,7 @@ If a text view is added to an empty text network, it keeps its attributes.
_tf.draws_background = YES;
_tf.is_horizontally_resizable = NO;
_tf.is_vertically_resizable = NO;
_tf.is_vertically_resizable = YES;
/* We set defaults for all shared attributes here. If container is already
part of a text network, we reset the attributes in -setTextContainer:. */
@ -730,6 +730,7 @@ that makes decoding and encoding compatible with the old code.
[aCoder encodeSize: [self maxSize] forKey: @"NSMaxSize"];
[aCoder encodeSize: [self minSize] forKey: @"NSMinSize"];
[aCoder encodeObject: tvsd forKey: @"NSSharedData"];
RELEASE(tvsd);
[aCoder encodeObject: [self textStorage] forKey: @"NSTextStorage"];
[aCoder encodeObject: [self textContainer] forKey: @"NSTextContainer"];
[aCoder encodeInt: 0 forKey: @"NSTVFlags"]; // no delegates, etc... set to zero.
@ -792,18 +793,25 @@ that makes decoding and encoding compatible with the old code.
{
[self setMaxSize: [aDecoder decodeSizeForKey: @"NSMaxSize"]];
}
if ([aDecoder containsValueForKey: @"NSMinize"])
else
{
// it's NSMinize in pre-10.3 formats.
[self setMinSize: [aDecoder decodeSizeForKey: @"NSMinize"]];
[self setMaxSize: NSMakeSize(_frame.size.width, HUGE)];
}
if ([aDecoder containsValueForKey: @"NSMinSize"])
{
// However, if NSMinSize is present we want to use it.
// If NSMinSize is present we want to use it.
[self setMinSize: [aDecoder decodeSizeForKey: @"NSMinSize"]];
}
else if ([aDecoder containsValueForKey: @"NSMinize"])
{
// it's NSMinize in pre-10.3 formats.
[self setMinSize: [aDecoder decodeSizeForKey: @"NSMinize"]];
}
else
{
[self setMinSize: _frame.size];
}
if ([aDecoder containsValueForKey: @"NSSharedData"])
{
@ -831,7 +839,7 @@ that makes decoding and encoding compatible with the old code.
_tf.allows_undo = ((0x40000000 & flags) > 0);
_tf.owns_text_network = YES;
_tf.is_horizontally_resizable = YES;
_tf.is_horizontally_resizable = NO;
_tf.is_vertically_resizable = YES;
}
@ -1672,10 +1680,12 @@ incorrectly. */
_tf.is_vertically_resizable = flag;
}
- (BOOL) isHorizontallyResizable
{
return _tf.is_horizontally_resizable;
}
- (BOOL) isVerticallyResizable
{
return _tf.is_vertically_resizable;
@ -1686,14 +1696,17 @@ incorrectly. */
{
return _maxSize;
}
- (NSSize) minSize
{
return _minSize;
}
- (void) setMaxSize: (NSSize)newMaxSize
{
_maxSize = newMaxSize;
}
- (void) setMinSize: (NSSize)newMinSize
{
_minSize = newMinSize;