mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-20 22:06:42 +00:00
2015-09-13 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView.m: Invalidate insertion point timer in dealloc. * Source/NSToolbarItem.m: Check for drawing rect within bounds before drawing toolbar item. Patch by Marcian Lytwyn <gna@advcsi.com>. 2015-09-10 Doug Simons <doug.simons@testplant.com> and Paul Landers <paul.landers@testplant.com> * Source/NSLayoutManager.m: Fix a bug that would try to adjust the length of the selected range to a negative number, leading to an exception and eventual crashes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38986 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7a251b66ec
commit
ff61d4c642
4 changed files with 54 additions and 30 deletions
|
@ -2915,7 +2915,7 @@ no_soft_invalidation:
|
|||
(of selection, wrt range, before change)
|
||||
--------------------------
|
||||
after after location += lengthChange;
|
||||
in after length = NSMaxRange(sel)-NSMaxRange(range)-lengthChange; location=NSMaxRange(range);
|
||||
in after length = NSMaxRange(sel)-(NSMaxRange(range)-lengthChange); location=NSMaxRange(range);
|
||||
in in length = 0; location=NSMaxRange(range);
|
||||
before after length += lengthChange;
|
||||
before in length = range.location-location;
|
||||
|
@ -2937,7 +2937,7 @@ no_soft_invalidation:
|
|||
{
|
||||
if (NSMaxRange(_selected_range) > NSMaxRange(range) - lengthChange)
|
||||
{ /* in after */
|
||||
newRange.length = NSMaxRange(_selected_range) - NSMaxRange(range) - lengthChange;
|
||||
newRange.length = NSMaxRange(_selected_range) - (NSMaxRange(range) - lengthChange);
|
||||
newRange.location = NSMaxRange(range);
|
||||
}
|
||||
else
|
||||
|
@ -2958,6 +2958,12 @@ no_soft_invalidation:
|
|||
{ /* before before */
|
||||
}
|
||||
|
||||
/* sanity check */
|
||||
if (NSMaxRange(newRange) > [_textStorage length])
|
||||
{
|
||||
newRange = NSMakeRange(MIN(range.location, [_textStorage length]), 0);
|
||||
}
|
||||
|
||||
/* If there are text views attached to us, let them handle the
|
||||
change. */
|
||||
if ([self firstTextView])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue