Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_canvas.c edje_editor_gradient.c
edje_editor_toolbar.c main.h
Log Message:
* fix 2 small bug in gradient
* remove some unused
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_canvas.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_canvas.c 13 Jul 2008 13:28:07 -0000 1.7
+++ edje_editor_canvas.c 15 Jul 2008 02:40:45 -0000 1.8
@@ -107,12 +107,9 @@
// Move First Gradient Point Handler
if ((int)(long)data == DRAG_GRAD_1 || (int)(long)data == DRAG_GRAD_2 )
{
- const char *type;
evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
evas_object_geometry_get(EV_focus_handler, &parentx, &parenty,
&parentw, &parenth);
- type = edje_edit_state_gradient_type_get(edje_o, Cur.part->string,
- Cur.state->string);
//printf("GELLA %d %d %d %d [%f] [m %d %d]\n", fhx, fhy, fhw, fhh,
(float)(mouse_x - fhx)/(float)fhx, mouse_x, mouse_y);
if ((int)(long)data == DRAG_GRAD_1)
{
@@ -152,7 +149,6 @@
}
gradient_frame_update();
fill_frame_update();
- edje_edit_string_free(type);
}
canvas_redraw();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_gradient.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_editor_gradient.c 15 Jul 2008 00:55:42 -0000 1.6
+++ edje_editor_gradient.c 15 Jul 2008 02:40:45 -0000 1.7
@@ -383,6 +383,8 @@
printf("SET %s\n", type);
edje_edit_state_gradient_type_set(edje_o, Cur.part->string,
Cur.state->string, type);
+ canvas_redraw();
+
return ETK_TRUE;
}
Etk_Bool
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- edje_editor_toolbar.c 15 Jul 2008 00:55:42 -0000 1.13
+++ edje_editor_toolbar.c 15 Jul 2008 02:40:45 -0000 1.14
@@ -387,7 +387,7 @@
switch ((int)(long)data)
{
- case NEW_RECT:
+ case NEW_RECT:
if (!etk_string_length_get(Cur.group))
{
dialog_alert_show("You must first select a group.");
@@ -574,11 +574,14 @@
//Create state
edje_edit_state_add(edje_o, Cur.part->string, name);
-
edje_edit_state_rel1_relative_x_set(edje_o,Cur.part->string,name2,0.1);
-
edje_edit_state_rel1_relative_y_set(edje_o,Cur.part->string,name2,0.1);
-
edje_edit_state_rel2_relative_x_set(edje_o,Cur.part->string,name2,0.9);
-
edje_edit_state_rel2_relative_y_set(edje_o,Cur.part->string,name2,0.9);
+ edje_edit_state_rel1_relative_x_set(edje_o, Cur.part->string,name2,
0.1);
+ edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string,name2,
0.1);
+ edje_edit_state_rel2_relative_x_set(edje_o, Cur.part->string,name2,
0.9);
+ edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string,name2,
0.9);
edje_edit_state_text_size_set(edje_o, Cur.part->string, name2, 16);
+
+ if (edje_edit_part_type_get(edje_o, Cur.part->string) ==
EDJE_PART_TYPE_GRADIENT)
+ edje_edit_state_gradient_type_set(edje_o, Cur.part->string, name2,
"linear");
//Add state to tree
row = tree_state_add(Cur.part->string, name2);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- main.h 15 Jul 2008 00:55:43 -0000 1.43
+++ main.h 15 Jul 2008 02:40:45 -0000 1.44
@@ -209,8 +209,5 @@
#define EDJE_ASPECT_PREFER_HORIZONTAL 2
#define EDJE_ASPECT_PREFER_BOTH 3
-#define EDJE_GRADIENT_TYPE_LINEAR 0
-#define EDJE_GRADIENT_TYPE_RADIAL 1
-
#endif
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
