bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanies 

SVN revision: 8574
This commit is contained in:
Carsten Haitzler 2004-01-20 01:04:16 +00:00
parent b8d3b7762c
commit b2102064ed
4 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/src/lib/Edje.h
View File

@ -20,8 +20,8 @@
extern "C" { extern "C" {
#endif #endif
void edje_init (void); int edje_init (void);
void edje_shutdown (void); int edje_shutdown (void);
void edje_frametime_set (double t); void edje_frametime_set (double t);
double edje_frametime_get (void); double edje_frametime_get (void);
void edje_freeze (void); void edje_freeze (void);

25
legacy/edje/src/lib/edje_main.c
View File

@ -3,30 +3,29 @@
static int initted = 0; static int initted = 0;
void int
edje_init(void) edje_init(void)
{ {
if (initted) return; initted++;
initted = 1; if (initted == 1)
{
eet_init(); _edje_edd_setup();
_edje_text_init();
_edje_edd_setup(); }
_edje_text_init(); return initted;
} }
void int
edje_shutdown(void) edje_shutdown(void)
{ {
if (!initted) return; initted--;
if (initted > 0) return initted;
_edje_edd_free(); _edje_edd_free();
_edje_color_class_members_free(); _edje_color_class_members_free();
_edje_text_class_members_free(); _edje_text_class_members_free();
eet_shutdown(); return 0;
initted = 0;
} }
Edje * Edje *

12
legacy/edje/src/lib/edje_private.h
View File

@ -426,8 +426,8 @@ struct _Edje_Real_Part
struct { struct {
int x, y; int x, y;
} tmp; } tmp;
double x, y; double x, y;
char need_reset : 1; unsigned char need_reset : 1;
struct { struct {
double x, y; double x, y;
} val, size, step, page; } val, size, step, page;
@ -474,8 +474,8 @@ struct _Edje_Signal_Callback
char *source; char *source;
void (*func) (void *data, Evas_Object *o, const char *emission, const char *source); void (*func) (void *data, Evas_Object *o, const char *emission, const char *source);
void *data; void *data;
char just_added : 1; unsigned char just_added : 1;
char delete_me : 1; unsigned char delete_me : 1;
}; };
struct _Edje_Calc_Params struct _Edje_Calc_Params
@ -487,8 +487,8 @@ struct _Edje_Calc_Params
struct { struct {
int x, y, w, h; int x, y, w, h;
} req_drag; } req_drag;
char visible : 1; unsigned char visible : 1;
char smooth : 1; unsigned char smooth : 1;
struct { struct {
int x, y, w, h; int x, y, w, h;
} fill; } fill;

19
legacy/edje/src/lib/edje_text.c
View File

@ -1,8 +1,6 @@
#include "Edje.h" #include "Edje.h"
#include "edje_private.h" #include "edje_private.h"
static Evas_Hash *_edje_text_class_hash = NULL;
Edje_Text_Style _edje_text_styles[EDJE_TEXT_EFFECT_LAST]; Edje_Text_Style _edje_text_styles[EDJE_TEXT_EFFECT_LAST];
void void
@ -239,6 +237,14 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
free(pt->default_desc->text.text_class); free(pt->default_desc->text.text_class);
pt->default_desc->text.text_class = NULL; pt->default_desc->text.text_class = NULL;
} }
if (pt->default_desc && pt->default_desc->color_class)
{
_edje_color_class_member_del(ed, pt->default_desc->color_class);
free (pt->default_desc->color_class);
pt->default_desc->color_class = NULL;
}
for (tmp = pt->other_desc; tmp; tmp = tmp->next) for (tmp = pt->other_desc; tmp; tmp = tmp->next)
{ {
Edje_Part_Description *desc; Edje_Part_Description *desc;
@ -250,6 +256,13 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
free(desc->text.text_class); free(desc->text.text_class);
desc->text.text_class = NULL; desc->text.text_class = NULL;
} }
if (desc->color_class)
{
_edje_color_class_member_del(ed, desc->color_class);
free(desc->color_class);
desc->color_class = NULL;
}
} }
return; return;
} }
@ -257,8 +270,6 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
void void
_edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep) _edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep)
{ {
Evas_List *tmp;
while (ep->extra_objects) while (ep->extra_objects)
{ {
Evas_Object *o; Evas_Object *o;