rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ligature not correctly supported

This commit is contained in:
Roy Qu 2024-02-25 22:08:10 +08:00
parent fda9a424c4
commit 6b1e4ff979
4 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RedPandaIDE/editor.cpp
View File

@ -1820,7 +1820,6 @@ void Editor::onStatusChanged(QSynedit::StatusChanges changes)
invalidateLine(mHighlightCharPos2.line);
}
}
}
}
@ -1842,6 +1841,8 @@ void Editor::onStatusChanged(QSynedit::StatusChanges changes)
} else {
mCurrentHighlightedWord = "";
}
} else {
mCurrentHighlightedWord = "";
}
if (mOldHighlightedWord != mCurrentHighlightedWord) {

13
libs/qsynedit/qsynedit/document.cpp
View File

@ -1706,7 +1706,7 @@ BinaryFileError::BinaryFileError(const QString& reason):
}
int searchForSegmentIdx(const QList<int> segList, int minVal, int maxVal, int value)
int searchForSegmentIdx(const QList<int> &segList, int minVal, int maxVal, int value)
{
if (value<minVal)
return 0;
@ -1787,7 +1787,7 @@ void expandGlyphStartCharList(const QString &strAdded, int oldStrLen, QList<int>
}
}
int calcSegmentInterval(const QList<int> segList, int maxVal, int idx)
int calcSegmentInterval(const QList<int> &segList, int maxVal, int idx)
{
if (idx<0 || idx>=segList.length())
return 0;
@ -1796,4 +1796,13 @@ int calcSegmentInterval(const QList<int> segList, int maxVal, int idx)
return segList[idx+1]-segList[idx];
}
int segmentIntervalStart(const QList<int> &segList, int minVal, int maxVal, int idx)
{
if (idx<0)
return minVal;
if (idx>=segList.length())
return maxVal;
return segList[idx];
}
}

5
libs/qsynedit/qsynedit/document.h
View File

@ -30,8 +30,9 @@
namespace QSynedit {
int searchForSegmentIdx(const QList<int> segList, int minVal, int maxVal, int value);
int calcSegmentInterval(const QList<int> segList, int maxVal, int idx);
int searchForSegmentIdx(const QList<int> &segList, int minVal, int maxVal, int value);
int calcSegmentInterval(const QList<int> &segList, int maxVal, int idx);
int segmentIntervalStart(const QList<int> &segList, int minVal, int maxVal, int idx);
QList<int> calcGlyphStartCharList(const QString &text);
void expandGlyphStartCharList(const QString& strAdded, int oldStrLen, QList<int> glyphStartCharList);

49
libs/qsynedit/qsynedit/painter.cpp
View File

@ -389,13 +389,13 @@ void QSynEditPainter::paintToken(
int glyphLen = calcSegmentInterval(glyphStartCharList,lineText.length(),i);
QString glyph = lineText.mid(glyphStart,glyphLen);
int glyphWidth = calcSegmentInterval(glyphStartPositionList, tokenRight, i);
// qDebug()<<"painting:"<<glyph<<glyphWidth<<tokenWidth+glyphWidth<<first<<last;
if (tokenWidth+glyphWidth>first) {
if (!startPaint ) {
nX-= (first - tokenWidth - 1) ;
startPaint = true;
}
}
// qDebug()<<"painting:"<<glyph<<glyphWidth<<nX<<tokenWidth+glyphWidth<<first<<last;
//painter->drawText(nX,rcToken.bottom()-painter->fontMetrics().descent()*edit->dpiFactor() , Token[i]);
if (startPaint) {
bool drawed = false;
@ -422,16 +422,16 @@ void QSynEditPainter::paintToken(
// if (!OperatorGlyphs.contains(glyph))
// break;
if (isAscii) {
if ( glyph.length()!=1
|| glyph.front().unicode()<=32
|| glyph.front().unicode()>=128)
if ( glyph2.length()!=1
|| glyph2.front().unicode()<=32
|| glyph2.front().unicode()>=128)
break;
} else {
if ( glyph.length()<1
if ( glyph2.length()<1
||
(glyph.length()==1
&& glyph.front().unicode()>32
&& glyph.front().unicode()<128))
(glyph2.length()==1
&& glyph2.front().unicode()>32
&& glyph2.front().unicode()<128))
break;
}
i+=1;
@ -441,7 +441,11 @@ void QSynEditPainter::paintToken(
break;
}
if (!fontInited || lastGlyphAscii!=isAscii) {
mPainter->setFont(font);
if (isAscii) {
mPainter->setFont(font);
} else {
mPainter->setFont(fontForNonAscii);
}
lastGlyphAscii = isAscii;
fontInited = true;
}
@ -692,7 +696,6 @@ void QSynEditPainter::addHighlightToken(
QList<int> &glyphStartPositionList,
int &tokenWidth)
{
bool bCanAppend;
QColor foreground, background;
FontStyles style;
@ -720,11 +723,14 @@ void QSynEditPainter::addHighlightToken(
token,attri,style,foreground,background);
// Do we have to paint the old chars first, or can we just append?
bCanAppend = false;
bool bCanAppend = false;
bool bInitFont = (mTokenAccu.width==0);
if (mTokenAccu.width > 0 ) {
if (showGlyphs == mTokenAccu.showSpecialGlyphs) {
// font style must be the same or token is only spaces
if (mTokenAccu.style == style) {
if (mTokenAccu.style != style) {
bInitFont = true;
} else {
if (
// background color must be the same and
(mTokenAccu.background == background) &&
@ -738,7 +744,8 @@ void QSynEditPainter::addHighlightToken(
if (!bCanAppend)
paintHighlightToken(lineText, glyphStartCharList, glyphStartPositionList, false);
}
if (!bCanAppend) {
if (bInitFont) {
mTokenAccu.style = style;
mTokenAccu.font = mEdit->font();
mTokenAccu.font.setBold(style & FontStyle::fsBold);
mTokenAccu.font.setItalic(style & FontStyle::fsItalic);
@ -779,7 +786,6 @@ void QSynEditPainter::addHighlightToken(
mTokenAccu.endGlyph = endGlyph;
mTokenAccu.foreground = foreground;
mTokenAccu.background = background;
mTokenAccu.style = style;
mTokenAccu.showSpecialGlyphs = showGlyphs;
}
}
@ -933,6 +939,7 @@ void QSynEditPainter::paintLines()
rcLine.setBottom((mFirstRow - mEdit->mTopLine) * mEdit->mTextHeight);
mTokenAccu.width = 0;
mTokenAccu.left = 0;
mTokenAccu.style = FontStyle::fsNone;
// Now loop through all the lines. The indices are valid for Lines.
BufferCoord selectionBegin = mEdit->blockBegin();
BufferCoord selectionEnd= mEdit->blockEnd();
@ -1224,14 +1231,20 @@ void QSynEditPainter::paintLines()
area->endX += mEdit->mInputPreeditString.length();
}
}
area->beginX = mEdit->charToGlyphLeft(vLine, sLine, area->beginX);
area->endX = mEdit->charToGlyphLeft(vLine,sLine,area->endX);
int glyphIdx;
glyphIdx = searchForSegmentIdx(glyphStartCharList, 0, sLine.length(), area->beginX);
area->beginX = segmentIntervalStart(glyphStartPositionsList, 0, tokenLeft, glyphIdx);
glyphIdx = searchForSegmentIdx(glyphStartCharList, 0, sLine.length(), area->endX);
area->endX = segmentIntervalStart(glyphStartPositionsList, 0, tokenLeft, glyphIdx);
}
//input method
if (mIsCurrentLine && mEdit->mInputPreeditString.length()>0) {
PEditingArea area = std::make_shared<EditingArea>();
area->beginX = mEdit->charToGlyphLeft(vLine,sLine, mEdit->mCaretX);
area->endX = mEdit->charToGlyphLeft(vLine,sLine,mEdit->mCaretX + mEdit->mInputPreeditString.length());
int glyphIdx;
glyphIdx = searchForSegmentIdx(glyphStartCharList, 0, sLine.length(), mEdit->mCaretX-1);
area->beginX = segmentIntervalStart(glyphStartPositionsList, 0, tokenLeft, glyphIdx);
glyphIdx = searchForSegmentIdx(glyphStartCharList, 0, sLine.length(), mEdit->mCaretX+mEdit->mInputPreeditString.length()-1);
area->endX = segmentIntervalStart(glyphStartPositionsList, 0, tokenLeft, glyphIdx);
area->type = EditingAreaType::eatUnderLine;
if (preeditAttr) {
area->color = preeditAttr->foreground();