From 3b747718eaf2f450217ada62e5132fb681107ca8 Mon Sep 17 00:00:00 2001
From: Themba Dube <embeddedthemba@gmail.com>
Date: Wed, 27 Mar 2019 18:36:57 -0400
Subject: [PATCH] More text area fixes

---
 src/lv_objx/lv_ta.c | 25 +++++++++++++++++++++----
 src/lv_objx/lv_ta.h |  7 +++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/lv_objx/lv_ta.c b/src/lv_objx/lv_ta.c
index 8ef4ae24e..670a6ab74 100644
--- a/src/lv_objx/lv_ta.c
+++ b/src/lv_objx/lv_ta.c
@@ -231,6 +231,7 @@ void lv_ta_add_char(lv_obj_t * ta, uint32_t c)
     if(ext->pwd_mode != 0) pwd_char_hider(ta);  /*Make sure all the current text contains only '*'*/
 
     lv_label_ins_text(ext->label, ext->cursor.pos, (const char *)letter_buf);    /*Insert the character*/
+    lv_ta_clear_selection(ta); /*Clear selection*/
 
     if(ext->pwd_mode != 0) {
 
@@ -311,6 +312,7 @@ void lv_ta_add_text(lv_obj_t * ta, const char * txt)
 
     /*Insert the text*/
     lv_label_ins_text(ext->label, ext->cursor.pos, txt);
+    lv_ta_clear_selection(ta);
 
     if(ext->pwd_mode != 0) {
         ext->pwd_tmp = lv_mem_realloc(ext->pwd_tmp, strlen(ext->pwd_tmp) + strlen(txt) + 1);
@@ -380,6 +382,7 @@ void lv_ta_del_char(lv_obj_t * ta)
     lv_txt_cut(label_txt, ext->cursor.pos - 1, 1);
     /*Refresh the label*/
     lv_label_set_text(ext->label, label_txt);
+    lv_ta_clear_selection(ta);
 
     /*Don't let 'width == 0' because cursor will not be visible*/
     if(lv_obj_get_width(ext->label) == 0) {
@@ -418,6 +421,7 @@ void lv_ta_del_char_forward(lv_obj_t * ta)
 	if(cp != lv_ta_get_cursor_pos(ta)) lv_ta_del_char(ta);
 }
 
+
 /*=====================
  * Setter functions
  *====================*/
@@ -965,6 +969,18 @@ void lv_ta_get_selection(lv_obj_t * ta, int * sel_start, int * sel_end) {
 	*sel_end = ext_label->selection_end;
 }
 
+/**
+ * Find whether text is selected or not.
+ * @param ta Text area object
+ * @return whether text is selected or not
+ */
+bool lv_ta_text_is_selected(const lv_obj_t *ta) {
+	lv_ta_ext_t * ext = lv_obj_get_ext_attr(ta);
+	lv_label_ext_t * ext_label = lv_obj_get_ext_attr(ext->label);
+
+	return (ext_label->selection_start == -1 || ext_label->selection_end == -1);
+}
+
 /*=====================
  * Other functions
  *====================*/
@@ -977,10 +993,11 @@ void lv_ta_clear_selection(lv_obj_t * ta) {
 	lv_ta_ext_t * ext = lv_obj_get_ext_attr(ta);
 	lv_label_ext_t * ext_label = lv_obj_get_ext_attr(ext->label);
 
-	ext_label->selection_start = -1;
-	ext_label->selection_end = -1;
-
-	lv_obj_invalidate(ta);
+	if(ext_label->selection_start != -1 || ext_label->selection_end != -1) {
+		ext_label->selection_start = -1;
+		ext_label->selection_end = -1;
+		lv_obj_invalidate(ta);
+	}
 }
 
 /**
diff --git a/src/lv_objx/lv_ta.h b/src/lv_objx/lv_ta.h
index 5b191edbe..be1e07436 100644
--- a/src/lv_objx/lv_ta.h
+++ b/src/lv_objx/lv_ta.h
@@ -375,6 +375,13 @@ lv_style_t * lv_ta_get_style(const lv_obj_t *ta, lv_ta_style_t type);
 
 void lv_ta_get_selection(lv_obj_t * ta, int * sel_start, int * sel_end);
 
+/**
+ * Find whether text is selected or not.
+ * @param ta Text area object
+ * @return whether text is selected or not
+ */
+bool lv_ta_text_is_selected(const lv_obj_t *ta);
+
 /*=====================
  * Other functions
  *====================*/