removed redundant code

This commit is contained in:
Hermet Park 2016-06-05 13:09:52 +09:00
parent 4e688f87b5
commit 4da3778f80
7 changed files with 6 additions and 36 deletions

View File

@ -361,7 +361,6 @@ live_edit_insert(live_data *ld)
//Calculate relative_to values to fix its size
//in case of width and height are fixed
Eina_Bool fixed_w = elm_check_state_get(ld->fixed_w_check);
Evas_Coord min_w = 0;
if (!ld->rel_to_info.rel1_x_to && !ld->rel_to_info.rel2_x_to &&
@ -376,7 +375,6 @@ live_edit_insert(live_data *ld)
}
Eina_Bool fixed_h = elm_check_state_get(ld->fixed_h_check);
Evas_Coord min_h = 0;
if (!ld->rel_to_info.rel1_y_to && !ld->rel_to_info.rel2_y_to &&
@ -1367,15 +1365,6 @@ rel_to_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
elm_ctxpopup_dismiss(obj);
}
static void
fixed_ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
live_data *ld = data;
ld->fixed_ctxpopup = NULL;
evas_object_del(obj);
}
static void
rel_to_ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)

View File

@ -589,20 +589,6 @@ list_create(Evas_Object *parent)
return list;
}
static Evas_Object *
toggle_create(Evas_Object *parent, const char *text, Eina_Bool state)
{
Evas_Object *toggle = elm_check_add(parent);
elm_object_style_set(toggle, "toggle");
elm_check_state_set(toggle, state);
evas_object_size_hint_weight_set(toggle, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toggle, EVAS_HINT_FILL, 0);
elm_object_text_set(toggle, text);
evas_object_show(toggle);
return toggle;
}
static void
font_scale_slider_changed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)

View File

@ -541,9 +541,8 @@ tools_template_insert(void)
}
char syntax[12];
if (enventor_object_template_insert(base_enventor_get(),
ENVENTOR_TEMPLATE_INSERT_DEFAULT,
syntax, sizeof(syntax)))
if (enventor_object_template_insert(base_enventor_get(), syntax,
sizeof(syntax)))
{
char msg[64];
snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax);

View File

@ -218,7 +218,6 @@ class Enventor.Object (Elm.Widget, Efl.File) {
template_insert {
return: bool;
params {
@in insert_type: Enventor_Template_Insert_Type;
@in syntax: char *;
@in n: size;
}

View File

@ -220,7 +220,7 @@ Edje_Part_Type view_part_type_get(view_data *vd, const char *part);
Eina_Bool template_part_insert(edit_data *ed, Edje_Part_Type part_type, Enventor_Template_Insert_Type insert_type, Eina_Bool fixed_w, Eina_Bool fixed_h, char *rel1_x_to, char *rel1_y_to, char *rel2_x_to, char *rel2_y_to, float align_x, float align_y, int min_w, int min_h,
float rel1_x, float rel1_y, float rel2_x, float rel2_y, const Eina_Stringshare *group_name, char *syntax, size_t n);
Eina_Bool template_insert(edit_data *ed, Enventor_Template_Insert_Type insert_type, char *syntax, size_t n);
Eina_Bool template_insert(edit_data *ed, char *syntax, size_t n);
/* ctxpopup */

View File

@ -826,10 +826,9 @@ _enventor_object_live_view_get(Eo *obj EINA_UNUSED,
EOLIAN static Eina_Bool
_enventor_object_template_insert(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd,
Enventor_Template_Insert_Type insert_type,
char *syntax, size_t n)
{
return template_insert(pd->main_it.ed, insert_type, syntax, n);
return template_insert(pd->main_it.ed, syntax, n);
}
EOLIAN static Eina_Bool

View File

@ -55,7 +55,7 @@ image_description_add(edit_data *ed)
cursor_pos2 = cursor_pos1;
else
{
template_insert(ed, ENVENTOR_TEMPLATE_INSERT_LIVE_EDIT, NULL, 0);
template_insert(ed, NULL, 0);
cursor_pos2 = elm_entry_cursor_pos_get(edit_entry);
}
}
@ -405,9 +405,7 @@ template_part_insert(edit_data *ed, Edje_Part_Type part_type,
}
Eina_Bool
template_insert(edit_data *ed,
Enventor_Template_Insert_Type insert_type,
char *syntax, size_t n)
template_insert(edit_data *ed, char *syntax, size_t n)
{
Evas_Object *entry = edit_entry_get(ed);
Eina_Stringshare *paragh = edit_cur_paragh_get(ed);