parent
8700b81cb2
commit
4d42a6d2db
|
@ -938,7 +938,7 @@ data_write_lua_scripts(Eet_File *ef)
|
||||||
_edje_lua_error_and_abort(L, err_code, ef);
|
_edje_lua_error_and_abort(L, err_code, ef);
|
||||||
lua_dump(L, _edje_lua_script_writer, &data);
|
lua_dump(L, _edje_lua_script_writer, &data);
|
||||||
#else // LUA_PLAIN_TEXT
|
#else // LUA_PLAIN_TEXT
|
||||||
data.buf = lua_tostring(L, -1);
|
data.buf = (char *)lua_tostring(L, -1);
|
||||||
data.size = strlen(data.buf);
|
data.size = strlen(data.buf);
|
||||||
#endif
|
#endif
|
||||||
//printf("lua chunk size: %d\n", data.size);
|
//printf("lua chunk size: %d\n", data.size);
|
||||||
|
|
|
@ -326,7 +326,10 @@ output(void)
|
||||||
if (file_out)
|
if (file_out)
|
||||||
{
|
{
|
||||||
snprintf(out, sizeof(out), "%s/%s", outdir, file_out);
|
snprintf(out, sizeof(out), "%s/%s", outdir, file_out);
|
||||||
symlink(sf->name, out);
|
if (symlink(sf->name, out) != 0)
|
||||||
|
{
|
||||||
|
printf("ERROR: symlink %s -> %s failed\n", sf->name, out);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
chmod(out, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP);
|
chmod(out, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP);
|
||||||
|
|
|
@ -2447,10 +2447,11 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name)
|
||||||
pd->gradient.rel2.offset_y = -1;
|
pd->gradient.rel2.offset_y = -1;
|
||||||
pd->gradient.use_rel = 1;
|
pd->gradient.use_rel = 1;
|
||||||
|
|
||||||
if (rp->part->type == EDJE_PART_TYPE_EXTERNAL && rp->part->source)
|
if ((rp->part->type == EDJE_PART_TYPE_EXTERNAL) && (rp->part->source))
|
||||||
{
|
{
|
||||||
Edje_External_Param_Info *pi;
|
Edje_External_Param_Info *pi;
|
||||||
pi = edje_external_param_info_get(rp->part->source);
|
|
||||||
|
pi = (Edje_External_Param_Info *)edje_external_param_info_get(rp->part->source);
|
||||||
while (pi && pi->name)
|
while (pi && pi->name)
|
||||||
{
|
{
|
||||||
Edje_External_Param *p;
|
Edje_External_Param *p;
|
||||||
|
@ -2513,7 +2514,7 @@ edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, const
|
||||||
|
|
||||||
#define PD_COPY(_x) pdto->_x = pdfrom->_x
|
#define PD_COPY(_x) pdto->_x = pdfrom->_x
|
||||||
#define PD_STRING_COPY(_x) _edje_if_string_free(ed, pdto->_x); \
|
#define PD_STRING_COPY(_x) _edje_if_string_free(ed, pdto->_x); \
|
||||||
pdto->_x = eina_stringshare_add(pdfrom->_x)
|
pdto->_x = (char *)eina_stringshare_add(pdfrom->_x)
|
||||||
PD_COPY(align.x);
|
PD_COPY(align.x);
|
||||||
PD_COPY(align.y);
|
PD_COPY(align.y);
|
||||||
PD_COPY(fixed.w);
|
PD_COPY(fixed.w);
|
||||||
|
@ -3424,7 +3425,7 @@ edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const cha
|
||||||
*value = &p->d;
|
*value = &p->d;
|
||||||
break;
|
break;
|
||||||
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
|
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
|
||||||
*value = p->s;
|
*value = (void *)p->s;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
@ -5754,7 +5755,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
|
||||||
//External
|
//External
|
||||||
if (rp->part->type == EDJE_PART_TYPE_EXTERNAL)
|
if (rp->part->type == EDJE_PART_TYPE_EXTERNAL)
|
||||||
{
|
{
|
||||||
if ((ll = edje_edit_state_external_params_list_get(obj, part, state)))
|
if ((ll = (Eina_List *)edje_edit_state_external_params_list_get(obj, part, state)))
|
||||||
{
|
{
|
||||||
Edje_External_Param *p;
|
Edje_External_Param *p;
|
||||||
|
|
||||||
|
@ -6169,7 +6170,10 @@ edje_edit_save(Evas_Object *obj)
|
||||||
fseek(f, 0, SEEK_SET);
|
fseek(f, 0, SEEK_SET);
|
||||||
|
|
||||||
sf->file = _alloc(sz + 1); //TODO check result and return nicely
|
sf->file = _alloc(sz + 1); //TODO check result and return nicely
|
||||||
fread(sf->file, sz, 1, f);
|
if (fread(sf->file, sz, 1, f) != 1)
|
||||||
|
{
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
sf->file[sz] = '\0';
|
sf->file[sz] = '\0';
|
||||||
fseek(f, 0, SEEK_SET);
|
fseek(f, 0, SEEK_SET);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
|
@ -2054,7 +2054,8 @@ _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur)
|
||||||
{
|
{
|
||||||
Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
|
Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
|
||||||
if (!c) return 0;
|
if (!c) return 0;
|
||||||
return evas_textblock_cursor_node_format_get(c);
|
if (evas_textblock_cursor_node_format_get(c)) return 1;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
|
@ -2070,7 +2071,7 @@ _edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur)
|
||||||
{
|
{
|
||||||
Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
|
Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
|
||||||
const char *s;
|
const char *s;
|
||||||
static buf[16];
|
static char buf[16];
|
||||||
int pos, pos2, ch;
|
int pos, pos2, ch;
|
||||||
if (!c) return NULL;
|
if (!c) return NULL;
|
||||||
s = evas_textblock_cursor_node_format_get(c);
|
s = evas_textblock_cursor_node_format_get(c);
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
#include "edje_private.h"
|
#include "edje_private.h"
|
||||||
|
|
||||||
static const unsigned int _edje_conte_nan_int = 0x7fc00000;
|
static const unsigned int _edje_const_nan_int = 0x7fc00000;
|
||||||
float *_edje_const_nan = (float *)(&(_edje_conte_nan_int));
|
float *_edje_const_nan = (float *)(&(_edje_const_nan_int));
|
||||||
|
|
||||||
static int _edje_init_count = 0;
|
static int _edje_init_count = 0;
|
||||||
static int _edje_log_dom_global = -1;
|
static int _edje_log_dom_global = -1;
|
||||||
|
|
|
@ -1366,6 +1366,7 @@ void _edje_entry_text_markup_set(Edje_Real_Part *rp, const char *text);
|
||||||
void _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text);
|
void _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text);
|
||||||
void _edje_entry_set_cursor_start(Edje_Real_Part *rp);
|
void _edje_entry_set_cursor_start(Edje_Real_Part *rp);
|
||||||
void _edje_entry_set_cursor_end(Edje_Real_Part *rp);
|
void _edje_entry_set_cursor_end(Edje_Real_Part *rp);
|
||||||
|
void _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst);
|
||||||
void _edje_entry_select_none(Edje_Real_Part *rp);
|
void _edje_entry_select_none(Edje_Real_Part *rp);
|
||||||
void _edje_entry_select_all(Edje_Real_Part *rp);
|
void _edje_entry_select_all(Edje_Real_Part *rp);
|
||||||
const Eina_List *_edje_entry_anchor_geometry_get(Edje_Real_Part *rp, const char *anchor);
|
const Eina_List *_edje_entry_anchor_geometry_get(Edje_Real_Part *rp, const char *anchor);
|
||||||
|
|
Loading…
Reference in New Issue