mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-26 02:14:22 +00:00
Code Activity

TextEditor: Fix a highlighting bug

Browse source
This commit is contained in:
ed 2021-08-13 16:31:33 +01:00
parent c3cb59d6ae
commit 6f8c464747
1 changed files with 10 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

56
modules/juce_gui_basics/widgets/juce_TextEditor.cpp
View file

@ -415,8 +415,6 @@ struct TextEditor::Iterator
void beginNewLine()
{
++currentLineIndex;
lineY += lineHeight * lineSpacing;
float lineWidth = 0;
@ -657,36 +655,16 @@ struct TextEditor::Iterator
return roundToInt (maxWidth);
}
std::vector<Range<int>> getLineRanges()
Rectangle<int> getTextBounds (Range<int> range) const
{
std::vector<Range<int>> ranges;
auto startX = indexToX (range.getStart());
auto endX = indexToX (range.getEnd());
int index = currentLineIndex;
Range<int> currentLineRange;
while (next())
{
if (index < currentLineIndex)
{
currentLineRange.setEnd (indexInText - 1);
ranges.push_back (currentLineRange);
currentLineRange = { indexInText, indexInText };
index = currentLineIndex;
}
}
currentLineRange.setEnd (atom != nullptr ? indexInText + atom->numChars
: indexInText);
if (! currentLineRange.isEmpty())
ranges.push_back (currentLineRange);
return ranges;
return Rectangle<float> (startX, lineY, endX - startX, lineHeight * lineSpacing).toNearestInt();
}
//==============================================================================
int indexInText = 0, currentLineIndex = 0;
int indexInText = 0;
float lineY = 0, lineHeight = 0, maxDescent = 0;
float atomX = 0, atomRight = 0;
const TextAtom* atom = nullptr;
@ -730,14 +708,9 @@ private:
if (shouldStartNewLine)
{
if (split == numRemaining)
{
beginNewLine();
}
else
{
++currentLineIndex;
lineY += lineHeight * lineSpacing;
}
}
atomRight = atomX + longAtom.width;
@ -1490,23 +1463,14 @@ Point<int> TextEditor::getTextOffset() const noexcept
RectangleList<int> TextEditor::getTextBounds (Range<int> textRange)
{
RectangleList<int> boundingBox;
Iterator i (*this);
for (auto lineRange : Iterator { *this }.getLineRanges())
while (i.next())
{
auto intersection = lineRange.getIntersectionWith (textRange);
if (! intersection.isEmpty())
if (textRange.intersects ({ i.indexInText,
i.indexInText + i.atom->numChars }))
{
Point<float> anchorStart, anchorEnd;
float lineHeight = 0.0f;
getCharPosition (intersection.getStart(), anchorStart, lineHeight);
getCharPosition (intersection.getEnd(), anchorEnd, lineHeight);
boundingBox.add (Rectangle<float> (anchorStart.x, anchorStart.y, anchorEnd.x - anchorStart.x, lineHeight).toNearestInt());
if (intersection == textRange)
break;
boundingBox.add (i.getTextBounds (textRange));
}
}