Github Issue #92: The textCursor position is saved before the Markdow…

…n symbols are shown. After the Markdown symbols are shown, MkEdit is set with the saved textcursor position
AngryFender · Aug 2, 2023 · 18adb1d · 18adb1d
1 parent f1bf38d
commit 18adb1d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/mkedit.cpp b/mkedit.cpp
@@ -604,11 +604,21 @@ void MkEdit::cursorPositionChangedHandle()
         if(!cursor.hasSelection()){
             selectRange.start = -1;
             selectRange.end = -1;
+            selectRange.currentposInBlock = cursor.positionInBlock();
+            selectRange.currentBlockPos = cursor.block().position();
         }else{
             selectRange.start = cursor.selectionStart();
             selectRange.end = cursor.selectionEnd();
         }
 
         emit cursorPosChanged( textCursor().hasSelection(), currentBlockNumber, getVisibleRect(), &selectRange);
+
+        if(!cursor.hasSelection()){
+            cursor.movePosition(QTextCursor::StartOfLine,QTextCursor::MoveAnchor,selectRange.currentBlockPos);
+            for(int rep = 0; rep < selectRange.currentposInBlock; rep++){
+                cursor.movePosition(QTextCursor::NextCharacter,QTextCursor::MoveAnchor);
+            }
+            this->setTextCursor(cursor);
+        }
     }
 }
diff --git a/mktextdocument.cpp b/mktextdocument.cpp
@@ -445,7 +445,6 @@ void MkTextDocument::hideAllFormatSymbolsInTextBlock(QTextBlock &block, FormatDa
     QString textBlock = block.text();
     bool isLink = false;
     int linkEnd = 0, linkStart = 0;
-    int linkTitleEnd = -1, linkTitleStart = -1;
 
     const QString *symbol;
     int symbolPos = -1;
@@ -501,7 +500,7 @@ void MkTextDocument::showSymbols(QTextBlock &block, const QString &symbol)
 
 }
 
-void MkTextDocument::showAllFormatSymbolsInTextBlock(QTextBlock &block, FormatData *formatData)
+void MkTextDocument::showAllFormatSymbolsInTextBlock(QTextBlock &block, FormatData *formatData, SelectRange * selectRange)
 {
     QString textBlock = block.text();
     const int blockPos = block.position();
@@ -524,6 +523,15 @@ void MkTextDocument::showAllFormatSymbolsInTextBlock(QTextBlock &block, FormatDa
 
     for(QVector<PositionData*>::Iterator it = formatData->pos_begin(); it < formatData->pos_end(); it++)
     {
+        int cursorPos = (*it)->getPos();
+        int symbolLen = (*it)->getSymbol().length();
+
+        if(selectRange){
+            if(cursorPos< selectRange->currentposInBlock){
+                selectRange->currentposInBlock = selectRange->currentposInBlock+symbolLen;
+            }
+        }
+
         showSymbolsAtPos(textBlock, (*it)->getPos(), (*it)->getSymbol());
 
         if((*it)->getSymbol() == LINK_SYMBOL_URL_START){
@@ -895,7 +903,7 @@ void MkTextDocument::hideMKSymbolsFromDrawingRect(QRect rect, bool hasSelection,
                         if(formatData->isHidden()){
                             formatData->setHidden(false);
                             resetTextBlockFormat(block);
-                            showAllFormatSymbolsInTextBlock(block, formatData);
+                            showAllFormatSymbolsInTextBlock(block, formatData, editSelectRange);
                         }
                         QTextCursor cursor(block);
                         for(QVector<FragmentData*>::Iterator it = formatData->formats_begin(); it < formatData->formats_end(); it++)

diff --git a/mktextdocument.h b/mktextdocument.h
@@ -58,6 +58,8 @@ class FormatCollection{
 struct SelectRange{
     int start           = NO_SELECTION_POS;
     int end             = NO_SELECTION_POS;
+    int currentposInBlock      = NO_SELECTION_POS;
+    int currentBlockPos        = NO_SELECTION_POS;
     int blockStart      = NO_SELECTION_POS;
     int posInBlockStart = NO_SELECTION_POS;
     int blockEnd        = NO_SELECTION_POS;
@@ -171,7 +173,7 @@ public slots:
     void hideSymbolsAtPos(QString &text, int pos, const QString &symbol);
 
     void showSymbols(QTextBlock &block,const QString &symbol);
-    void showAllFormatSymbolsInTextBlock(QTextBlock &block, FormatData *formatData);
+    void showAllFormatSymbolsInTextBlock(QTextBlock &block, FormatData *formatData, SelectRange * selectRange = nullptr);
     void showSymbolsAtPos(QString &text, int pos, const QString &symbol);
 
     void autoCompleteCodeBlock(int blockNumber,bool &success);