Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c
Log Message:
Replace color canvas code with a simpler Etk_Evas_Object as that is all we
need.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- callbacks.c 19 Apr 2008 18:24:18 -0000 1.67
+++ callbacks.c 19 Apr 2008 21:24:54 -0000 1.68
@@ -1262,41 +1262,6 @@
return ETK_TRUE;
}
-/* Colors Callbacks */
-Etk_Bool
-on_ColorCanvas_realize(Etk_Widget *canvas, void *data)
-{
- //Must use the realize callback on the EtkCanvas object.
- //Because I can't add any object to the canvas before it is realized
- Evas_Object* rect;
- Etk_Widget *etk_evas_object;
- //Add the colored rectangle
- rect = evas_object_rectangle_add(etk_widget_toplevel_evas_get(canvas));
- evas_object_color_set(rect, 100,100,100,255);
- evas_object_resize(rect,300,300);
- etk_evas_object = etk_evas_object_new();
- etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), rect);
- etk_canvas_put(ETK_CANVAS(canvas), etk_evas_object ,0,0);
- etk_widget_show_all(etk_evas_object);
- evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
on_ColorCanvas_click, data);
- switch ((int)data){
- case COLOR_OBJECT_RECT:
- RectColorObject = rect;
- break;
- case COLOR_OBJECT_TEXT:
- TextColorObject = rect;
- break;
- case COLOR_OBJECT_SHADOW:
- ShadowColorObject = rect;
- break;
- case COLOR_OBJECT_OUTLINE:
- OutlineColorObject = rect;
- break;
- }
-
- return ETK_TRUE;
-}
-
void
on_ColorCanvas_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- interface.c 3 Mar 2008 23:07:52 -0000 1.68
+++ interface.c 19 Apr 2008 21:24:54 -0000 1.69
@@ -1367,12 +1367,13 @@
}
static Etk_Widget*
-create_a_color_button(char* label_text, int color_button_enum,int w,int h)
+create_a_color_button(char* label_text, int color_button_enum,int w,int h,
Evas *evas)
{
Etk_Widget *vbox;
- Etk_Widget *ColorCanvas;
Etk_Widget *label;
Etk_Widget *shadow;
+ Evas_Object* rect;
+ Etk_Widget *etk_evas_object;
//vbox
vbox = etk_vbox_new(ETK_FALSE, 3);
@@ -1385,12 +1386,34 @@
//etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity);
etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
- //ColorCanvas
- ColorCanvas = etk_canvas_new();
- //etk_box_append(ETK_BOX(vbox), ColorCanvas, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_container_add(ETK_CONTAINER(shadow), ColorCanvas);
- etk_signal_connect("realized", ETK_OBJECT(ColorCanvas),
ETK_CALLBACK(on_ColorCanvas_realize), (void*)color_button_enum);
- etk_widget_size_request_set(ColorCanvas, w, h);
+ //Add the colored rectangle
+ rect = evas_object_rectangle_add(evas);
+ evas_object_color_set(rect, 255,100,100,255);
+ evas_object_resize(rect, w, h);
+ etk_evas_object = etk_evas_object_new();
+ etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), rect);
+ evas_object_show(rect);
+ etk_widget_show_all(etk_evas_object);
+ evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
on_ColorCanvas_click, (void*)color_button_enum);
+ etk_container_add(ETK_CONTAINER(shadow), etk_evas_object);
+ etk_widget_size_request_set(etk_evas_object, w, h);
+ switch (color_button_enum)
+ {
+ case COLOR_OBJECT_RECT:
+ RectColorObject = rect;
+ break;
+ case COLOR_OBJECT_TEXT:
+ TextColorObject = rect;
+ break;
+ case COLOR_OBJECT_SHADOW:
+ ShadowColorObject = rect;
+ break;
+ case COLOR_OBJECT_OUTLINE:
+ OutlineColorObject = rect;
+ break;
+ }
+
+
//Label
if (label_text){
@@ -1976,9 +1999,9 @@
}
static Etk_Widget*
-create_rectangle_frame(void)
+create_rectangle_frame(Evas *evas)
{
- return create_a_color_button("Color",COLOR_OBJECT_RECT,100,30);
+ return create_a_color_button("Color",COLOR_OBJECT_RECT,100,30, evas);
}
static Etk_Widget*
@@ -2239,11 +2262,11 @@
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Color buttons
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Text",COLOR_OBJECT_TEXT,30,30),
+ etk_box_append(ETK_BOX(hbox),
create_a_color_button("Text",COLOR_OBJECT_TEXT,30,30, NULL),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Shadow",COLOR_OBJECT_SHADOW,30,30),
+ etk_box_append(ETK_BOX(hbox),
create_a_color_button("Shadow",COLOR_OBJECT_SHADOW,30,30, NULL),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Outline",COLOR_OBJECT_OUTLINE,30,30),
+ etk_box_append(ETK_BOX(hbox),
create_a_color_button("Outline",COLOR_OBJECT_OUTLINE,30,30, NULL),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton),
@@ -2921,7 +2944,7 @@
//RectEmbed
UI_RectEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_RectEmbed), create_rectangle_frame());
+ etk_container_add(ETK_CONTAINER(UI_RectEmbed),
create_rectangle_frame(UI_evas));
etk_embed_position_method_set(ETK_EMBED(UI_RectEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_RectEmbed);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
