From e3d06d87fb9f3030dff0fd6ffadfbb0907ac12ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Wed, 8 Jan 2020 14:31:36 +0100
Subject: [PATCH] [escher/text_field] Fix Cut event when selection

---
 escher/src/text_field.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index f3ea207f9..51a250559 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -372,9 +372,11 @@ bool TextField::privateHandleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::Copy || event == Ion::Events::Cut) {
     storeInClipboard();
     if (event == Ion::Events::Cut) {
-      reinitDraftTextBuffer();
-      resetSelection();
-      setEditing(true);
+      if (!m_contentView.selectionIsEmpty()) {
+        deleteSelection();
+      } else {
+        removeWholeText();
+      }
     }
     return true;
   }