New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[NETBEANS-977] Improve text layout in word wrap mode. #598
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
ide/editor.lib2/src/org/netbeans/modules/editor/lib2/view/CharSequenceCharacterIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.modules.editor.lib2.view; | ||
|
|
||
| import java.text.CharacterIterator; | ||
|
|
||
| /* This class was written from scratch. I considered using org.apache.pivot.text.CharacterIterator | ||
| from the Apache Pivot project, but it had bugs in the next() and previous() methods (trying to use | ||
| CharacterIterator.DONE = 65535 as an index). */ | ||
| /** | ||
| * Adapter class for providing a {@link CharacterIterator} over a {@link CharSequence} without | ||
| * making a copy of the entire underlying string. | ||
| * | ||
| * @author Eirik Bakke (ebakke@ultorg.com) | ||
| */ | ||
| class CharSequenceCharacterIterator implements CharacterIterator { | ||
| private final CharSequence charSequence; | ||
| private int index; | ||
|
|
||
| public CharSequenceCharacterIterator(CharSequence charSequence) { | ||
| if (charSequence == null) { | ||
| throw new NullPointerException(); | ||
| } | ||
| this.charSequence = charSequence; | ||
| } | ||
|
|
||
| @Override | ||
| public int getIndex() { | ||
| return index; | ||
| } | ||
|
|
||
| @Override | ||
| public char setIndex(int position) { | ||
| if (position < getBeginIndex() || position > getEndIndex()) { | ||
| throw new IllegalArgumentException(); | ||
| } | ||
| this.index = position; | ||
| return current(); | ||
| } | ||
|
|
||
| @Override | ||
| public char current() { | ||
| return index == getEndIndex() ? CharacterIterator.DONE : charSequence.charAt(index); | ||
| } | ||
|
|
||
| @Override | ||
| public char first() { | ||
| return setIndex(getBeginIndex()); | ||
| } | ||
|
|
||
| @Override | ||
| public char last() { | ||
| final int endIndex = getEndIndex(); | ||
| return setIndex(charSequence.length() == 0 ? endIndex : (endIndex - 1)); | ||
| } | ||
|
|
||
| @Override | ||
| public char next() { | ||
| if (index < getEndIndex()) { | ||
| index++; | ||
| } | ||
| return current(); | ||
| } | ||
|
|
||
| @Override | ||
| public char previous() { | ||
| if (index > getBeginIndex()) { | ||
| index--; | ||
| return current(); | ||
| } else { | ||
| return CharacterIterator.DONE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int getBeginIndex() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public int getEndIndex() { | ||
| return charSequence.length(); | ||
| } | ||
|
|
||
| @Override | ||
| public Object clone() { | ||
| CharacterIterator ret = new CharSequenceCharacterIterator(charSequence); | ||
| ret.setIndex(index); | ||
| return ret; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
original code did not change
availableWidthiflineContTextLayout == null; is it OK to alter it ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes; the getLineWrapType() != LineWrapType.NONE check is sufficient. Previously, getLineContinuationCharTextLayout would never return null in practice--only if the font could not display the line continuation character or its alternate. And if that ever happened, there would have been an NPE when WrapInfo calls paintTextLayout with the null layout.
I changed this so that getLineContinuationCharTextLayout can now return null without error (and added Javadoc to that effect). Rather than disabling line wrapping altogether, this simply avoids displaying displaying the line continuation character. Then I made this the default, unless the user opts to display hidden characters (paragraph marks etc).
I just looked over the call sites of getLineContinuationCharTextLayout again; they seem to do the right thing.