gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-05 03:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve behavior of selected range adjustments when invalidating.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17137 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2003-07-05 16:04:05 +00:00
parent b0a9cfac5d
commit b0070220fa
2 changed files with 48 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-07-05 18:02 Alexander Malmberg <alexander@malmberg.org>
* Source/NSLayoutManager.m
(-textStorage:edited:range:changeInLength:invalidatedRange:): Improve
behavior of the adjustments to the selected range.
2003-07-05 17:20 Alexander Malmberg <alexander@malmberg.org> 2003-07-05 17:20 Alexander Malmberg <alexander@malmberg.org>
* Source/NSAttributedString.m (-fixParagraphStyleAttributeInRange:): * Source/NSAttributedString.m (-fixParagraphStyleAttributeInRange:):

52
Source/NSLayoutManager.m
View file

@ -80,6 +80,8 @@ behavior.
Another assumption is that each text container will contain at least one Another assumption is that each text container will contain at least one
line frag (unless there are no more glyphs to typeset). line frag (unless there are no more glyphs to typeset).
TODO: this doesn't hold for containers with 0 height or 0 width. need to
test. rare case, though
@ -2079,23 +2081,53 @@ no_soft_invalidation:
One option is to only adjust when absolutely necessary to keep the One option is to only adjust when absolutely necessary to keep the
selected range valid. selected range valid.
Current behavior for all cases:
Start End Action
(of selection, wrt range, before change)
--------------------------
after after location += lengthChange;
in after length = NSMaxRange(sel)-NSMaxRange(range)-lengthChange; location=NSMaxRange(range);
in in length = 0; location=range.location;
before after length += lengthChange;
before in length = range.location-location;
before before do nothing
In other words, unless the selection spans over the entire changed
range, the changed range is deselected.
One important property of this behavios is that if length is 0 before,
it will be 0 after.
*/ */
if (_selected_range.location >= range.location + range.length - lengthChange) if (_selected_range.location >= NSMaxRange(range) - lengthChange)
{ { /* after after */
_selected_range.location += lengthChange; _selected_range.location += lengthChange;
} }
else if (_selected_range.location + _selected_range.length >= range.location) else if (_selected_range.location >= range.location)
{ {
if ((lengthChange < 0) && if (NSMaxRange(_selected_range) > NSMaxRange(range) - lengthChange)
((unsigned)(-lengthChange) > _selected_range.length)) { /* in after */
{ _selected_range.length = NSMaxRange(_selected_range) - NSMaxRange(range) - lengthChange;
_selected_range.location = NSMaxRange(range);
}
else
{ /* in in */
_selected_range.length = 0; _selected_range.length = 0;
_selected_range.location = range.location; _selected_range.location = range.location;
} }
else }
{ else if (NSMaxRange(_selected_range) > NSMaxRange(range) - lengthChange)
_selected_range.length += lengthChange; { /* before after */
} _selected_range.length += lengthChange;
}
else if (NSMaxRange(_selected_range) > range.location)
{ /* before in */
_selected_range.length = range.location - _selected_range.location;
}
else
{ /* before before */
} }
} }
} }