Fix delete key not functioning correctly in textboxes when text is se…

…lected
The-Powder-Toy · Apr 25, 2023 · ad14201 · ad14201
1 parent 8b7a96b
commit ad14201
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/gui/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp
@@ -360,10 +360,11 @@ void Textbox::OnVKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl,
 			StopTextEditing();
 			if (HasSelection())
 			{
-				if (getLowerSelectionBound() < 0 || getHigherSelectionBound() > (int)backingText.length())
+				int lowerBound = getLowerSelectionBound(), higherBound = getHigherSelectionBound();
+				if (lowerBound < 0 || higherBound > (int)backingText.length())
 					return;
-				backingText.Erase(getLowerSelectionBound(), getHigherSelectionBound());
-				cursor = getLowerSelectionBound();
+				backingText.Erase(lowerBound, higherBound - lowerBound);
+				cursor = lowerBound;
 				changed = true;
 			}
 			else if (backingText.length() && cursor < (int)backingText.length())
@@ -387,10 +388,11 @@ void Textbox::OnVKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl,
 			StopTextEditing();
 			if (HasSelection())
 			{
-				if (getLowerSelectionBound() < 0 || getHigherSelectionBound() > (int)backingText.length())
+				int lowerBound = getLowerSelectionBound(), higherBound = getHigherSelectionBound();
+				if (lowerBound < 0 || higherBound > (int)backingText.length())
 					return;
-				backingText.erase(backingText.begin()+getLowerSelectionBound(), backingText.begin()+getHigherSelectionBound());
-				cursor = getLowerSelectionBound();
+				backingText.Erase(lowerBound, higherBound - lowerBound);
+				cursor = lowerBound;
 				changed = true;
 			}
 			else if (backingText.length() && cursor > 0)