enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

remove newline stuff. 

SVN revision: 47130
This commit is contained in:
Carsten Haitzler 2010-03-11 08:08:15 +00:00
parent c86c9ea795
commit 6c46e85395
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/elementary/src/lib/elm_entry.c
View File

@ -15,7 +15,7 @@ struct _Widget_Data
Ecore_Event_Handler *sel_clear_handler; Ecore_Event_Handler *sel_clear_handler;
Ecore_Timer *longpress_timer; Ecore_Timer *longpress_timer;
const char *cut_sel; const char *cut_sel;
const char *stripped; const char *text;
Evas_Coord lastw; Evas_Coord lastw;
Evas_Coord downx, downy; Evas_Coord downx, downy;
Evas_Coord cx, cy, cw, ch; Evas_Coord cx, cy, cw, ch;
@ -105,7 +105,7 @@ _del_hook(Evas_Object *obj)
ecore_event_handler_del(wd->sel_clear_handler); ecore_event_handler_del(wd->sel_clear_handler);
#endif #endif
if (wd->cut_sel) eina_stringshare_del(wd->cut_sel); if (wd->cut_sel) eina_stringshare_del(wd->cut_sel);
if (wd->stripped) eina_stringshare_del(wd->stripped); if (wd->text) eina_stringshare_del(wd->text);
if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job); if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer); if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer);
EINA_LIST_FREE(wd->items, it) EINA_LIST_FREE(wd->items, it)
@ -746,8 +746,8 @@ _signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emiss
if (!wd) return; if (!wd) return;
wd->changed = EINA_TRUE; wd->changed = EINA_TRUE;
_sizing_eval(data); _sizing_eval(data);
if (wd->stripped) eina_stringshare_del(wd->stripped); if (wd->text) eina_stringshare_del(wd->text);
wd->stripped = NULL; wd->text = NULL;
evas_object_smart_callback_call(data, "changed", NULL); evas_object_smart_callback_call(data, "changed", NULL);
} }
@ -1158,7 +1158,7 @@ elm_entry_add(Evas_Object *parent)
_signal_mouse_up, obj); _signal_mouse_up, obj);
edje_object_signal_callback_add(wd->ent, "mouse,down,1,double", "elm.text", edje_object_signal_callback_add(wd->ent, "mouse,down,1,double", "elm.text",
_signal_mouse_double, obj); _signal_mouse_double, obj);
edje_object_part_text_set(wd->ent, "elm.text", "<br>"); edje_object_part_text_set(wd->ent, "elm.text", "");
elm_widget_resize_object_set(obj, wd->ent); elm_widget_resize_object_set(obj, wd->ent);
_sizing_eval(obj); _sizing_eval(obj);
@ -1228,8 +1228,10 @@ elm_entry_entry_set(Evas_Object *obj, const char *entry)
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
if (!entry) entry = "<br>"; if (!entry) entry = "";
edje_object_part_text_set(wd->ent, "elm.text", entry); edje_object_part_text_set(wd->ent, "elm.text", entry);
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
wd->changed = EINA_TRUE; wd->changed = EINA_TRUE;
_sizing_eval(obj); _sizing_eval(obj);
} }
@ -1242,26 +1244,17 @@ elm_entry_entry_get(const Evas_Object *obj)
const char *text, *s = NULL; const char *text, *s = NULL;
size_t len; size_t len;
if (!wd) return NULL; if (!wd) return NULL;
// Strip ending <br> that is added by the textblock if (wd->text) return wd->text;
// need to check if <br> is present? seems it is always there
if (wd->stripped) return wd->stripped;
text = edje_object_part_text_get(wd->ent, "elm.text"); text = edje_object_part_text_get(wd->ent, "elm.text");
if (!text) if (!text)
{ {
ERR("text=NULL for edje %p, part 'elm.text'", wd->ent); ERR("text=NULL for edje %p, part 'elm.text'", wd->ent);
return NULL; return NULL;
} }
len = strlen(text); if (wd->text) eina_stringshare_del(wd->text);
if (len < 4) wd->text = NULL;
{ if (text) wd->text = eina_stringshare_add(text);
ERR("text='%s' is smaller than 4 chars, missing '<br>'?", text); return wd->text;
return NULL;
}
if (text) s = eina_stringshare_add_length(text, len - 4);
if (wd->stripped) eina_stringshare_del(wd->stripped);
wd->stripped = s;
return s;
} }
EAPI const char * EAPI const char *