From c79898a7b81aae823c0d5dd6be35cfba960bf8e4 Mon Sep 17 00:00:00 2001
From: Ed Swartz <ed.swartz.258@gmail.com>
Date: Sun, 9 Feb 2020 08:48:35 -0600
Subject: [PATCH] Use left/right arrow to move cursor when unselecting in
 LineEdit

-- useful for rename dialog (the filename portion is selected by
default, and usually, want to change the end of the name, not the
beginning)
---
 scene/gui/line_edit.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index cea33db1b2..72f88b8959 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -381,13 +381,17 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
 					FALLTHROUGH;
 				}
 				case KEY_LEFT: {
-#ifdef APPLE_STYLE_KEYS
-					shift_selection_check_pre(k->get_shift());
-#else
-					if (!k->get_alt()) {
-						shift_selection_check_pre(k->get_shift());
-					}
+#ifndef APPLE_STYLE_KEYS
+					if (!k->get_alt())
 #endif
+					{
+						shift_selection_check_pre(k->get_shift());
+						if (selection.enabled && !k->get_shift()) {
+							set_cursor_position(selection.begin);
+							deselect();
+							break;
+						}
+					}
 
 #ifdef APPLE_STYLE_KEYS
 					if (k->get_command()) {
@@ -430,8 +434,13 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
 					FALLTHROUGH;
 				}
 				case KEY_RIGHT: {
-					shift_selection_check_pre(k->get_shift());
-
+					if (selection.enabled && !k->get_shift()) {
+						set_cursor_position(selection.end);
+						deselect();
+						break;
+					} else {
+						shift_selection_check_pre(k->get_shift());
+					}
 #ifdef APPLE_STYLE_KEYS
 					if (k->get_command()) {
 						set_cursor_position(text.length());