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-03-30 09:24:34 +08:00
parent 1b8dbf44e9
commit 3a098349bc
6 changed files with 166 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RedPandaIDE/editor.cpp
View File

@ -5492,7 +5492,6 @@ void Editor::applyColorScheme(const QString& schemeName)
mCurrentHighlighWordForeground = selectedForeground();
mCurrentHighlighWordBackground = selectedBackground();
}
this->invalidate();
}

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

@ -31,10 +31,12 @@
namespace QSynedit {
Document::Document(const QFont& font, QObject *parent):
QObject{parent},
mFontMetrics{font},
mTabSize{4},
mForceMonospace{false},
QObject{parent},
mFontMetrics{font},
mTabSize{4},
mForceMonospace{false},
mSetLineWidthLockCount{0},
mMaxLineChangedInSetLinesWidth{false},
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
mMutex{}
#else
@ -144,11 +146,13 @@ int Document::blockEnded(int line)
int Document::maxLineWidth() {
QMutexLocker locker(&mMutex);
if (mIndexOfLongestLine < 0) {
qDebug()<<"!!!!";
int MaxLen = -1;
mIndexOfLongestLine = -1;
if (mLines.count() > 0 ) {
for (int i=0;i<mLines.size();i++) {
int len = mLines[i]->mWidth;
qDebug()<<len<<i;
if (len > MaxLen) {
MaxLen = len;
mIndexOfLongestLine = i;
@ -156,10 +160,11 @@ int Document::maxLineWidth() {
}
}
}
if (mIndexOfLongestLine >= 0)
if (mIndexOfLongestLine >= 0) {
qDebug()<<mIndexOfLongestLine<<this->getLine(mIndexOfLongestLine);
return mLines[mIndexOfLongestLine]->width();
else
return 0;
} else
return -1;
}
QString Document::lineBreak() const
@ -384,7 +389,7 @@ void Document::deleteLines(int index, int numLines)
});
if (mIndexOfLongestLine>=index) {
if (mIndexOfLongestLine <index+numLines) {
mIndexOfLongestLine = -1;
invalidateIndexOfLongestLine();
} else {
mIndexOfLongestLine -= numLines;
}
@ -439,9 +444,9 @@ void Document::deleteAt(int index)
}
beginUpdate();
if (mIndexOfLongestLine == index)
mIndexOfLongestLine = -1;
invalidateIndexOfLongestLine();
else if (mIndexOfLongestLine>index)
mIndexOfLongestLine -= 1;
invalidateIndexOfLongestLine();
mLines.removeAt(index);
emit deleted(index,1);
endUpdate();
@ -475,7 +480,7 @@ void Document::putLine(int index, const QString &s, bool notify) {
oldWidth = mLines[index]->mWidth;
mLines[index]->setLineText( s );
if (mIndexOfLongestLine == index && oldWidth>mLines[index]->width() )
mIndexOfLongestLine = -1;
invalidateIndexOfLongestLine();
if (notify)
emit putted(index);
endUpdate();
@ -500,9 +505,9 @@ void Document::insertLines(int index, int numLines)
return;
beginUpdate();
auto action = finally([this]{
invalidateIndexOfLongestLine();
endUpdate();
});
mIndexOfLongestLine = -1;
PDocumentLine line;
mLines.insert(index,numLines,line);
for (int i=index;i<index+numLines;i++) {
@ -631,9 +636,9 @@ void Document::loadFromFile(const QString& filename, const QByteArray& encoding,
auto action = finally([this]{
if (mLines.count()>0)
emit inserted(0,mLines.count());
invalidateIndexOfLongestLine();
endUpdate();
});
mIndexOfLongestLine = -1;
//test for utf8 / utf 8 bom
if (encoding == ENCODING_AUTO_DETECT) {
if (file.atEnd()) {
@ -1159,13 +1164,30 @@ void Document::internalClear()
if (!mLines.isEmpty()) {
beginUpdate();
int oldCount = mLines.count();
mIndexOfLongestLine = -1;
mLines.clear();
invalidateIndexOfLongestLine();
emit deleted(0,oldCount);
endUpdate();
}
}
void Document::beginSetLinesWidth()
{
if (mSetLineWidthLockCount == 0) {
mMaxLineChangedInSetLinesWidth = false;
}
mSetLineWidthLockCount++;
}
void Document::endSetLinesWidth()
{
mSetLineWidthLockCount--;
if (mSetLineWidthLockCount == 0) {
if (mMaxLineChangedInSetLinesWidth)
emit maxLineWidthChanged();
}
}
void Document::setLineWidth(int line, const QString &lineText, int newWidth, const QList<int> glyphStartPositionList)
{
QMutexLocker locker(&mMutex);
@ -1179,17 +1201,32 @@ void Document::setLineWidth(int line, const QString &lineText, int newWidth, con
Q_ASSERT(mLines[line]->mGlyphStartPositionList.length() == mLines[line]->mGlyphStartCharList.length());
}
void Document::emitMaxLineWidthChanged()
{
if (mSetLineWidthLockCount>0) {
mMaxLineChangedInSetLinesWidth = true;
} else {
emit maxLineWidthChanged();
}
}
void Document::updateLongestLineWidth(int line, int width)
{
if (mIndexOfLongestLine<0) {
mIndexOfLongestLine = line;
emit maxLineWidthChanged(width);
emitMaxLineWidthChanged();
} else if (mLines[mIndexOfLongestLine]->mWidth < width) {
mIndexOfLongestLine = line;
emit maxLineWidthChanged(width);
emitMaxLineWidthChanged();
}
}
void Document::invalidateIndexOfLongestLine()
{
mIndexOfLongestLine = -1;
emitMaxLineWidthChanged();
}
QList<int> Document::calcGlyphPositionList(const QString &lineText, const QList<int> &glyphStartCharList, int left, int &right) const
{
return calcGlyphPositionList(lineText, glyphStartCharList,
@ -1240,10 +1277,12 @@ bool Document::empty()
void Document::invalidateAllLineWidth()
{
QMutexLocker locker(&mMutex);
mIndexOfLongestLine = -1;
for (PDocumentLine& line:mLines) {
line->invalidateWidth();
qDebug()<<line->mWidth<<line->mLineText<<"invalidated";
}
invalidateIndexOfLongestLine();
// mIndexOfLongestLine = -1;
}
DocumentLine::DocumentLine(DocumentLine::UpdateWidthFunc updateWidthFunc):

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

@ -567,7 +567,7 @@ signals:
void deleted(int startLine, int count);
void inserted(int startLine, int count);
void putted(int line);
void maxLineWidthChanged(int newWidth);
void maxLineWidthChanged();
protected:
QString getTextStr() const;
void setUpdateState(bool Updating);
@ -576,8 +576,12 @@ protected:
void putTextStr(const QString& text);
void internalClear();
private:
void beginSetLinesWidth();
void endSetLinesWidth();
void setLineWidth(int line, const QString& lineText, int newWidth, const QList<int> glyphStartPositionList);
void emitMaxLineWidthChanged();
void updateLongestLineWidth(int line, int width);
void invalidateIndexOfLongestLine();
int glyphWidth(const QString& glyph, int left,
const QFontMetrics &fontMetrics,
@ -617,6 +621,9 @@ private:
int mIndexOfLongestLine;
int mUpdateCount;
bool mForceMonospace;
int mSetLineWidthLockCount;
bool mMaxLineChangedInSetLinesWidth;
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
QRecursiveMutex mMutex;
#else

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

@ -927,6 +927,10 @@ void QSynEditPainter::getBraceColorAttr(int level, PTokenAttribute &attr)
void QSynEditPainter::paintLines()
{
mEdit->mDocument->beginSetLinesWidth();
auto action = finally([this](){
mEdit->mDocument->endSetLinesWidth();
});
QString sLine; // the current line
QString sToken; // token info
int tokenLeft, tokenWidth;

179
libs/qsynedit/qsynedit/qsynedit.cpp
View File

@ -41,7 +41,8 @@
#include <QTextEdit>
#include <QMimeData>
#define MAX_LINE_WIDTH_CHANGED_EVENT ((QEvent::Type)(QEvent::User+1))
#define UPDATE_HORIZONTAL_SCROLLBAR_EVENT ((QEvent::Type)(QEvent::User+1))
#define UPDATE_VERTICAL_SCROLLBAR_EVENT ((QEvent::Type)(QEvent::User+2))
namespace QSynedit {
QSynEdit::QSynEdit(QWidget *parent) : QAbstractScrollArea(parent),
@ -72,13 +73,12 @@ QSynEdit::QSynEdit(QWidget *parent) : QAbstractScrollArea(parent),
connect(mDocument.get(), &Document::inserted, this, &QSynEdit::onLinesInserted);
connect(mDocument.get(), &Document::putted, this, &QSynEdit::onLinesPutted);
connect(mDocument.get(), &Document::maxLineWidthChanged,
this, &QSynEdit::onMaxLineWidthChanged);
this, &QSynEdit::onMaxLineChanged);
connect(mDocument.get(), &Document::cleared, this, &QSynEdit::updateVScrollbar);
connect(mDocument.get(), &Document::deleted, this, &QSynEdit::updateVScrollbar);
connect(mDocument.get(), &Document::inserted, this, &QSynEdit::updateVScrollbar);
mGutterWidth = 0;
mScrollBars = ScrollStyle::ssBoth;
mUndoList = std::make_shared<UndoList>();
mUndoList->connect(mUndoList.get(), &UndoList::addedUndo, this, &QSynEdit::onUndoAdded);
@ -138,8 +138,7 @@ QSynEdit::QSynEdit(QWidget *parent) : QAbstractScrollArea(parent),
mBlockEnd = mBlockBegin;
mOptions = eoAutoIndent
| eoDragDropEditing | eoEnhanceEndKey | eoTabIndent |
eoGroupUndo | eoKeepCaretX | eoSelectWordByDblClick
| eoHideShowScrollbars ;
eoGroupUndo | eoKeepCaretX | eoSelectWordByDblClick;
mScrollTimer = new QTimer(this);
//mScrollTimer->setInterval(100);
@ -169,6 +168,7 @@ QSynEdit::QSynEdit(QWidget *parent) : QAbstractScrollArea(parent),
setAcceptDrops(true);
setFont(mFontDummy);
setScrollBars(ScrollStyle::ssBoth);
}
int QSynEdit::displayLineCount() const
@ -288,8 +288,9 @@ bool QSynEdit::canRedo() const
int QSynEdit::maxScrollWidth() const
{
int maxWidth = mDocument->maxLineWidth();
qDebug()<<maxWidth;
if (maxWidth <= 0)
return maxWidth; //all inlines invalid. Next paintEvent() will update it.
return 0;
if (useCodeFolding())
maxWidth += stringWidth(syntaxer()->foldString(""),maxWidth);
if (mOptions.testFlag(eoScrollPastEol))
@ -1745,9 +1746,15 @@ QString QSynEdit::getDisplayStringAtLine(int line) const
return s;
}
void QSynEdit::onMaxLineWidthChanged()
void QSynEdit::onMaxLineChanged()
{
QEvent * event = new QEvent(MAX_LINE_WIDTH_CHANGED_EVENT);
invalidate(); // repaint first, to update line widths
updateHScrollBarLater();
}
void QSynEdit::updateHScrollBarLater()
{
QEvent * event = new QEvent(UPDATE_HORIZONTAL_SCROLLBAR_EVENT);
qApp->postEvent(this,event);
}
@ -3020,11 +3027,9 @@ void QSynEdit::internalSetCaretXY(BufferCoord value, bool ensureVisible)
auto action = finally([this]{
decPaintLock();
});
// simply include the flags, fPaintLock is > 0
if (mCaretX != value.ch) {
mCaretX = value.ch;
mStatusChanges.setFlag(StatusChange::scCaretX);
mStateFlags.setFlag(StateFlag::sfHScrollbarChanged);
invalidateLine(mCaretY);
}
if (mCaretY != value.line) {
@ -3035,7 +3040,6 @@ void QSynEdit::internalSetCaretXY(BufferCoord value, bool ensureVisible)
invalidateLine(oldCaretY);
invalidateGutterLine(oldCaretY);
mStatusChanges.setFlag(StatusChange::scCaretY);
mStateFlags.setFlag(StateFlag::sfVScrollbarChanged);
}
// Call UpdateLastCaretX before DecPaintLock because the event handler it
// calls could raise an exception, and we don't want fLastCaretX to be
@ -3084,71 +3088,50 @@ void QSynEdit::doOnStatusChange(StatusChanges)
void QSynEdit::updateHScrollbar()
{
int nMin,nMax,nPage,nPos;
if (mPaintLock!=0) {
mStateFlags.setFlag(StateFlag::sfHScrollbarChanged);
} else {
mStateFlags.setFlag(StateFlag::sfHScrollbarChanged,false);
if (mScrollBars != ScrollStyle::ssNone) {
if (mOptions.testFlag(eoHideShowScrollbars)) {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
} else {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
}
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssHorizontal) {
nMin = 0;
nMax = maxScrollWidth();
if (nMax<=0)
return;
nPage = viewWidth();
nPos = mLeftPos;
horizontalScrollBar()->setMinimum(nMin);
horizontalScrollBar()->setMaximum(nMax);
horizontalScrollBar()->setPageStep(nPage);
horizontalScrollBar()->setValue(nPos);
horizontalScrollBar()->setSingleStep(mCharWidth);
} else
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
} else {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
}
updateHScrollBarLater();
}
}
void QSynEdit::doUpdateHScrollbar()
{
int nMin = 0;
int nMax = maxScrollWidth();
int nPage = viewWidth();
int nPos = mLeftPos;
horizontalScrollBar()->setMinimum(nMin);
horizontalScrollBar()->setMaximum(nMax);
horizontalScrollBar()->setPageStep(nPage);
horizontalScrollBar()->setValue(nPos);
horizontalScrollBar()->setSingleStep(mCharWidth);
}
void QSynEdit::updateVScrollbar()
{
int nMaxScroll;
int nMin,nMax,nPage,nPos;
if (mPaintLock!=0) {
mStateFlags.setFlag(StateFlag::sfVScrollbarChanged);
} else {
mStateFlags.setFlag(StateFlag::sfVScrollbarChanged,false);
if (mScrollBars != ScrollStyle::ssNone) {
if (mOptions.testFlag(eoHideShowScrollbars)) {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
} else {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
}
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssVertical) {
nMaxScroll = maxScrollHeight();
nMin = 0;
nMax = std::max(1, nMaxScroll);
nPage = mLinesInWindow * mTextHeight;
nPos = mTopPos;
verticalScrollBar()->setMinimum(nMin);
verticalScrollBar()->setMaximum(nMax);
verticalScrollBar()->setPageStep(nPage);
verticalScrollBar()->setValue(nPos);
verticalScrollBar()->setSingleStep(mTextHeight);
} else
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
} else {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
}
doUpdateVScrollbar();
}
}
void QSynEdit::doUpdateVScrollbar()
{
int nMin = 0;
int nMax = maxScrollHeight();
int nPage = mLinesInWindow * mTextHeight;
int nPos = mTopPos;
verticalScrollBar()->setMinimum(nMin);
verticalScrollBar()->setMaximum(nMax);
verticalScrollBar()->setPageStep(nPage);
verticalScrollBar()->setValue(nPos);
verticalScrollBar()->setSingleStep(mTextHeight);
}
void QSynEdit::updateCaret()
{
@ -3745,15 +3728,15 @@ void QSynEdit::onChanged()
emit changed();
}
void QSynEdit::onHScrolled(int)
void QSynEdit::onHScrolled(int value)
{
mLeftPos = horizontalScrollBar()->value();
mLeftPos = value;
invalidate();
}
void QSynEdit::onVScrolled(int)
void QSynEdit::onVScrolled(int value)
{
mTopPos = verticalScrollBar()->value();
mTopPos = value;
invalidate();
}
@ -3797,7 +3780,28 @@ ScrollStyle QSynEdit::scrollBars() const
void QSynEdit::setScrollBars(ScrollStyle newScrollBars)
{
ScrollStyle oldScrollBars = mScrollBars;
mScrollBars = newScrollBars;
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssHorizontal) {
if (mOptions.testFlag(eoHideShowScrollbars)) {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
} else {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
}
updateHScrollbar();
} else {
setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
}
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssVertical) {
if (mOptions.testFlag(eoHideShowScrollbars)) {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
} else {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
}
updateVScrollbar();
} else {
setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
}
}
int QSynEdit::mouseSelectionScrollSpeed() const
@ -4011,26 +4015,21 @@ EditorOptions QSynEdit::getOptions() const
static bool sameEditorOption(const EditorOptions& value1, const EditorOptions& value2, EditorOption flag) {
return value1.testFlag(flag)==value2.testFlag(flag);
}
void QSynEdit::setOptions(const EditorOptions &Value)
void QSynEdit::setOptions(const EditorOptions &value)
{
if (Value != mOptions) {
if (value != mOptions) {
incPaintLock();
//bool bSetDrag = mOptions.testFlag(eoDropFiles) != Value.testFlag(eoDropFiles);
//if (!mOptions.testFlag(eoScrollPastEol))
setLeftPos(mLeftPos);
//if (!mOptions.testFlag(eoScrollPastEof))
setTopPos(mTopPos);
bool bUpdateAll =
!sameEditorOption(Value,mOptions, eoShowLeadingSpaces)
|| !sameEditorOption(Value,mOptions, eoLigatureSupport)
|| !sameEditorOption(Value,mOptions, eoForceMonospace)
|| !sameEditorOption(Value,mOptions, eoShowInnerSpaces)
|| !sameEditorOption(Value,mOptions, eoShowTrailingSpaces)
|| !sameEditorOption(Value,mOptions, eoShowLineBreaks)
|| !sameEditorOption(Value,mOptions, eoShowRainbowColor);
mOptions = Value;
!sameEditorOption(value,mOptions, eoShowLeadingSpaces)
|| !sameEditorOption(value,mOptions, eoLigatureSupport)
|| !sameEditorOption(value,mOptions, eoForceMonospace)
|| !sameEditorOption(value,mOptions, eoShowInnerSpaces)
|| !sameEditorOption(value,mOptions, eoShowTrailingSpaces)
|| !sameEditorOption(value,mOptions, eoShowLineBreaks)
|| !sameEditorOption(value,mOptions, eoShowRainbowColor);
mOptions = value;
setScrollBars(mScrollBars);
mDocument->setForceMonospace(mOptions.testFlag(eoForceMonospace) );
// constrain caret position to MaxScrollWidth if eoScrollPastEol is enabled
@ -5960,8 +5959,8 @@ void QSynEdit::timerEvent(QTimerEvent *event)
bool QSynEdit::event(QEvent *event)
{
switch(event->type()) {
case MAX_LINE_WIDTH_CHANGED_EVENT:
updateHScrollbar();
case UPDATE_HORIZONTAL_SCROLLBAR_EVENT:
doUpdateHScrollbar();
break;
case QEvent::KeyPress:{
QKeyEvent* keyEvent = static_cast<QKeyEvent *>(event);
@ -6421,7 +6420,7 @@ int QSynEdit::maxScrollHeight() const
if (mOptions.testFlag(eoScrollPastEof))
return (std::max(displayLineCount(),1) - 1) * mTextHeight;
else
return std::max((displayLineCount()-mLinesInWindow+1) * mTextHeight, 1) ;
return std::max((displayLineCount()-mLinesInWindow+1) * mTextHeight, 0) ;
}
bool QSynEdit::modified() const
@ -6798,8 +6797,13 @@ void QSynEdit::setLeftPos(int value)
//value = std::min(value,maxScrollWidth());
value = std::max(value, 0);
if (value != mLeftPos) {
horizontalScrollBar()->setValue(value);
setStatusChanged(StatusChange::scLeftPos);
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssHorizontal)
horizontalScrollBar()->setValue(value);
else {
mLeftPos = value;
invalidate();
}
}
}
@ -6818,8 +6822,13 @@ void QSynEdit::setTopPos(int value)
//value = std::min(value,maxScrollHeight());
value = std::max(value, 0);
if (value != mTopPos) {
verticalScrollBar()->setValue(value);
setStatusChanged(StatusChange::scTopPos);
if (mScrollBars == ScrollStyle::ssBoth || mScrollBars == ScrollStyle::ssVertical) {
verticalScrollBar()->setValue(value);
} else {
mTopPos = value;
invalidate();
}
}
}

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

@ -529,7 +529,9 @@ private:
void setStatusChanged(StatusChanges changes);
void doOnStatusChange(StatusChanges changes);
void updateHScrollbar();
void doUpdateHScrollbar();
void updateVScrollbar();
void doUpdateVScrollbar();
void updateCaret();
void recalcCharExtent();
QString expandAtWideGlyphs(const QString& S);
@ -650,7 +652,8 @@ private:
private slots:
void onMaxLineWidthChanged();
void onMaxLineChanged();
void updateHScrollBarLater();
void onBookMarkOptionsChanged();
void onGutterChanged();
void onLinesChanged();