[CORRECTIVE] Fix overwriting selection in expressions. Follow up to 8…

…fd2ee3.

editors/ComponentEditor/common/ExpressionEditor.cpp

@@ -309,3 +309,11 @@ int ExpressionEditor::getSelectionLastWord() const
 {
  return toPlainText().left(textCursor().selectionEnd()).count(WORD_DELIMITER);
 }
+
+//-----------------------------------------------------------------------------
+// Function: ExpressionEditor::getSelectionStartIndex()
+//-----------------------------------------------------------------------------
+int ExpressionEditor::getSelectionStartIndex() const
+{
+ return textCursor().selectionStart();
+}

editors/ComponentEditor/common/ExpressionEditor.h

@@ -234,6 +234,13 @@ private slots:
  * @return Length of the last word in the selection.
  */
  int getSelectionLastWord() const final;
+
+ /*!
+ * Get the start index of the selection.
+ * 
+ * @return The start index of the current selection.
+ */
+ int getSelectionStartIndex() const final;
 };
 
 #endif // EXPRESSIONEDITOR_H

editors/ComponentEditor/common/ExpressionLineEditor.cpp

@@ -240,3 +240,11 @@ int ExpressionLineEditor::getSelectionLastWord() const
 {
  return text().left(selectionEnd()).count(WORD_DELIMITER);
 }
+
+//-----------------------------------------------------------------------------
+// Function: ExpressionLineEditor::getSelectionStartIndex()
+//-----------------------------------------------------------------------------
+int ExpressionLineEditor::getSelectionStartIndex() const
+{
+ return selectionStart();
+}

editors/ComponentEditor/common/ExpressionLineEditor.h

@@ -224,6 +224,13 @@ private slots:
  * @return Length of the last word in the selection.
  */
  int getSelectionLastWord() const final;
+
+ /*!
+ * Get the start index of the selection.
+ *
+ * @return The start index of the current selection.
+ */
+ int getSelectionStartIndex() const final;
 };
 
 #endif // EXPRESSIONLINEEDITOR_H

editors/ComponentEditor/common/MasterExpressionEditor.cpp

@@ -490,7 +490,7 @@ void MasterExpressionEditor::replaceSelectionInExpression(QKeyEvent* keyEvent)
 
  int firstTermPos = indexOfNthWord(firstWord, expression_);
  expression_.remove(expression_.indexOf(selectedText, firstTermPos), selectedText.length());
- expression_.insert(firstTermPos, keyEvent->text()); // Don't just remove selection, also insert whatever was typed.
+ expression_.insert(getSelectionStartIndex(), keyEvent->text()); // Don't just remove selection, also insert whatever was typed.
 }
 
 //-----------------------------------------------------------------------------

editors/ComponentEditor/common/MasterExpressionEditor.h

@@ -274,6 +274,13 @@ class MasterExpressionEditor
  */
  virtual int getSelectionLastWord() const = 0;
 
+ /*!
+ * Get the start index of the selection.
+ *
+ * @return The start index of the current selection.
+ */
+ virtual int getSelectionStartIndex() const = 0;
+
  /*!
  * Checks if the editing would change text in the middle of a referencing term.
  *

version.h

@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL 3.13.519.0
+#define VERSION_FULL 3.13.534.0
 
 #define VERSION_BASEYEAR 0
-#define VERSION_DATE "2024-07-15"
-#define VERSION_TIME "17:24:58"
+#define VERSION_DATE "2024-07-29"
+#define VERSION_TIME "13:53:28"
 
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 13
-#define VERSION_BUILDNO 519
+#define VERSION_BUILDNO 534
 #define VERSION_EXTEND 0
 
-#define VERSION_FILE 3,13,519,0
-#define VERSION_PRODUCT 3,13,519,0
-#define VERSION_FILESTR "3,13,519,0"
-#define VERSION_PRODUCTSTR "3,13,519,0"
+#define VERSION_FILE 3,13,534,0
+#define VERSION_PRODUCT 3,13,534,0
+#define VERSION_FILESTR "3,13,534,0"
+#define VERSION_PRODUCTSTR "3,13,534,0"
 
 #endif