gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 17:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into windows_corrections

Browse source
This commit is contained in:
Gregory John Casamento 2020-09-12 19:57:44 -04:00
commit faf57dd7a5
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2020-09-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView.m (-initWithCoder:): Make sure text container is
in sync with the text view resize behaviour.
* Source/NSScrollView.m (-initWithCoder:): Add scrollers as
subviews when decoded.
2020-09-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSLayoutManager.m

6
Source/NSScrollView.m
View file

@ -965,7 +965,7 @@ static CGFloat scrollerWidth;
}
else if (_rulersVisible)
{
[self addSubview:_horizRuler];
[self addSubview: _horizRuler];
}
if (_rulersVisible)
@ -1016,7 +1016,7 @@ static CGFloat scrollerWidth;
}
else if (_rulersVisible)
{
[self addSubview:_vertRuler];
[self addSubview: _vertRuler];
}
if (_rulersVisible)
@ -1676,12 +1676,14 @@ GSOppositeEdge(NSRectEdge edge)
{
[self setHorizontalScroller: hScroller];
[hScroller setHidden: NO];
[self addSubview: _horizScroller];
}
if (vScroller != nil && _hasVertScroller)
{
[self setVerticalScroller: vScroller];
[vScroller setHidden: NO];
[self addSubview: _vertScroller];
}
if ([aDecoder containsValueForKey: @"NSHeaderClipView"])

4
Source/NSTextView.m
View file

@ -986,6 +986,10 @@ that makes decoding and encoding compatible with the old code.
{
NSTextContainer *container = [self buildUpTextNetwork: _frame.size];
[container setTextView: self];
// These calls are here to make the text container aware of these settings
[self setHorizontallyResizable: _tf.is_horizontally_resizable];
[self setVerticallyResizable: _tf.is_vertically_resizable];
}
//@"NSDragTypes"