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

work save

This commit is contained in:
Roy Qu 2024-01-19 21:36:54 +08:00
parent 14913d664e
commit 4a190ec873
2 changed files with 112 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,10 +85,10 @@ int Document::lineColumns(int index)
{
QMutexLocker locker(&mMutex);
if (index>=0 && index < mLines.size()) {
if (mLines[index]->columns == -1) {
if (mLines[index]->columns() == -1) {
return calculateLineColumns(index);
} else
return mLines[index]->columns;
return mLines[index]->columns();
} else
return 0;
}
@ -789,6 +789,31 @@ void Document::saveToFile(QFile &file, const QByteArray& encoding,
}
}
int Document::gryphsColumns(const QStringList &gryphs, int colsBefore) const
{
int columns = std::max(0,colsBefore);
for (int i=0;i<gryphs.length();i++) {
QString glyph = gryphs[i];
int glyphCols;
if (glyph.length()==1 && glyph[0].unicode()<0xFF) {
QChar ch = glyph[0];
if (ch == '\t') {
glyphCols = mTabWidth - columns % mTabWidth;
} else if (ch.unicode()<=32) { //invisible char
glyphCols +=1;
} else {
width = mFontMetrics.horizontalAdvance(ch);
glyphCols += std::ceil(width / (double)mCharWidth);
}
} else {
width = mNonAsciiFontMetrics.horizontalAdvance(glyph);
glyphCols += std::ceil(width / (double)mCharWidth);
}
columns+=glyphCols;
}
return columns-colsBefore;
}
int Document::stringColumns(const QString &line, int colsBefore) const
{
int columns = std::max(0,colsBefore);
@ -805,14 +830,12 @@ int Document::stringColumns(const QString &line, int colsBefore) const
charCols = mTabWidth - columns % mTabWidth;
} else if (ch.unicode()<=32) {
charCols +=1;
} else {
width = mFontMetrics.horizontalAdvance(ch);
charCols += std::ceil(width / (double)mCharWidth);
}
columns+=charCols;
} else {
token+=ch;
width = mNonAsciiFontMetrics.horizontalAdvance(ch);
charCols += std::ceil(width / (double)mCharWidth);
}
columns+=charCols;
}
if (!token.isEmpty()) {
columns += tokenColumns(token);
@ -822,7 +845,9 @@ int Document::stringColumns(const QString &line, int colsBefore) const
int Document::tokenColumns(const QString &token) const
{
int width = mNonAsciiFontMetrics.horizontalAdvance(token);
//return std::ceil((int)(fontMetrics().horizontalAdvance(ch) * dpiFactor()) / (double)mCharWidth);
return std::ceil(width / (double)mCharWidth);
}
int Document::charColumns(QChar ch) const
@ -916,12 +941,64 @@ void Document::invalidAllLineColumns()
}
DocumentLine::DocumentLine():
lineText(),
syntaxState(),
columns(-1)
mSyntaxState{},
mColumns{-1}
{
}
const QStringList &DocumentLine::glyphs() const
{
return mGlyphs;
}
int DocumentLine::length() const
{
return mGlyphs.length();
}
const QString& DocumentLine::lineText() const
{
return mLineText;
}
void DocumentLine::setLineText(const QString &newLineText)
{
mLineText = newLineText;
//parse mGlyphs
int i=0;
while (i<mLineText.length()) {
if (mLineText[i].isHighSurrogate() && i+1<mLineText.length() && mLineText[i].isLowSurrogate()) {
//character that larger than 0xffff
mGryphs.append(mLineText.mid(i,2));
i++;
} else if (mLineText[i].combiningClass()!=0 && !mGryphs.isEmpty()
&& mGryphs.last().length()>0) {
//Combining character
QString gryph=mGryphs.last();
gryph.append(mLineText[i]);
mGryphs[mGryphs.length()-1]=gryph;
} else {
mGryphs.append(mLineText[i]);
}
i++;
}
}
int DocumentLine::columns() const
{
return mColumns;
}
const SyntaxState& DocumentLine::syntaxState() const
{
return mSyntaxState;
}
void DocumentLine::setSyntaxState(const SyntaxState &newSyntaxState)
{
mSyntaxState = newSyntaxState;
}
UndoList::UndoList():QObject()
{

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

@ -30,14 +30,28 @@
namespace QSynedit {
struct DocumentLine {
QString lineText;
SyntaxState syntaxState;
int columns; //
class DocumentLine {
public:
explicit DocumentLine();
DocumentLine(const DocumentLine&)=delete;
DocumentLine& operator=(const DocumentLine&)=delete;
explicit DocumentLine();
DocumentLine(const DocumentLine&)=delete;
DocumentLine& operator=(const DocumentLine&)=delete;
const QStringList& glyphs() const;
int length() const;
const QString& lineText() const;
void setLineText(const QString &newLineText);
int columns() const;
const SyntaxState& syntaxState() const;
void setSyntaxState(const SyntaxState &newSyntaxState);
private:
QString mLineText;
QStringList mGlyphs;
SyntaxState mSyntaxState;
int mColumns;
};
typedef std::shared_ptr<DocumentLine> PDocumentLine;
@ -100,7 +114,9 @@ public:
void loadFromFile(const QString& filename, const QByteArray& encoding, QByteArray& realEncoding);
void saveToFile(QFile& file, const QByteArray& encoding,
const QByteArray& defaultEncoding, QByteArray& realEncoding);
int stringColumns(const QString& line, int colsBefore) const;
//int stringColumns(const QString &line, int colsBefore) const;
int gryphsColumns(const QStringList& gryphs, int colsBefore) const;
int tokenColumns(const QString &token) const;
int charColumns(QChar ch) const;
bool getAppendNewLineAtEOF();