Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c
Log Message:
* The object window follow min e max group size
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- callbacks.c 19 Jan 2007 14:40:07 -0000 1.12
+++ callbacks.c 20 Jan 2007 05:13:02 -0000 1.13
@@ -99,6 +99,13 @@
break;
case TOOLBAR_DEBUG:
DebugInfo(FALSE);
+ //ZOOM TEST :(
+ //int x,y,w,h;
+ //evas_output_size_get (etk_widget_toplevel_evas_get (ETK_canvas),
&w, &h);
+ //evas_output_size_set (etk_widget_toplevel_evas_get (ETK_canvas),
w+10, h+10);
+ //evas_output_viewport_get (etk_widget_toplevel_evas_get
(ETK_canvas), &x, &y, &w, &h);
+ //evas_output_viewport_set (etk_widget_toplevel_evas_get
(ETK_canvas), x+20, y+20, w+10, h+10);
+ //printf("ZOOM: %d %d - %d %d\n",x,y,w,h);
break;
case TOOLBAR_IMAGE_FILE_ADD:
ShowAlert("Not yet implemented =)");
@@ -223,18 +230,18 @@
//The group as changed
if (Cur.eg != old_group){
+ int w, h;
UpdateGroupFrame();
PopulateRelComboBoxes();
- //Update Fakewin
- ev_resize_fake(400,400);
+ //Update Fakewin
+ engrave_group_max_size_get(Cur.eg,&w,&h);
+ ev_resize_fake(w,h);
edje_object_part_text_set (EV_fakewin, "title", Cur.eg->name);
- printf("GROUP SET %s\n",Cur.eg->name);
- engrave_canvas_current_group_set (ecanvas, Cur.eg);
+ engrave_canvas_current_group_set (ecanvas, Cur.eg);
}
-
ev_redraw();
}
@@ -1052,7 +1059,9 @@
g_string_free(command,TRUE); */
}
-void on_AlertDialog_response(Etk_Dialog *dialog, int response_id, void *data){
+void
+on_AlertDialog_response(Etk_Dialog *dialog, int response_id, void *data)
+{
etk_widget_hide(ETK_WIDGET(dialog));
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas.c 19 Jan 2007 14:40:07 -0000 1.7
+++ evas.c 20 Jan 2007 05:13:02 -0000 1.8
@@ -155,11 +155,15 @@
rel2Y_parent_handler =
edje_object_add(etk_widget_toplevel_evas_get(ETK_canvas));
edje_object_file_set(rel2Y_parent_handler, EdjeFile, "Rel2Y_ParentH");
+ //Create engrave canvas
+ ecanvas = engrave_canvas_new (etk_widget_toplevel_evas_get(ETK_canvas));
+ // etk_canvas_object_add (ETK_CANVAS(ETK_canvas), ecanvas);
+
// Create Fake win
EV_fakewin = edje_object_add(etk_widget_toplevel_evas_get(ETK_canvas));
edje_object_file_set(EV_fakewin, EdjeFile, "FakeWin");
- etk_canvas_object_add(ETK_CANVAS(ETK_canvas),EV_fakewin);
+ // etk_canvas_object_add(ETK_CANVAS(ETK_canvas),EV_fakewin);
edje_object_signal_callback_add(EV_fakewin,"DRAG","miniarrow",on_Drag,(void*)DRAG_MINIARROW);
@@ -167,9 +171,7 @@
ev_resize_fake(200,200);
- //Create engrave canvas
- ecanvas = engrave_canvas_new (etk_widget_toplevel_evas_get(ETK_canvas));
- etk_canvas_object_add (ETK_CANVAS(ETK_canvas), ecanvas);
+
}
void
ev_adjust_position(Engrave_Part_State* state, Evas_Object* object)
@@ -469,10 +471,23 @@
void
ev_resize_fake(int w, int h)
{
- //printf("RESIZE: %d %d\n",w,h);
- if (!w) w = 200;
- if (!h) h = 200;
- evas_object_resize(EV_fakewin,w,h);
+ int max_w=0, max_h=0;
+ int min_w=0, min_h=0;
+
+ engrave_group_max_size_get(Cur.eg, &max_w, &max_h);
+ engrave_group_min_size_get(Cur.eg, &min_w, &min_h);
+
+ if (max_w > 0 && w > max_w) w = max_w;
+ if (max_h > 0 && h > max_h) h = max_h;
+
+ if (min_w > 0 && w < min_w) w = min_w;
+ if (min_h > 0 && h < min_h) h = min_h;
+
+ if (w < 0) w = 100;
+ if (h < 0) h = 100;
+
+ //printf("RESIZE: %d %d./ed \n",w,h);
+ evas_object_resize(EV_fakewin, w, h);
edje_object_part_drag_value_set (EV_fakewin, "miniarrow", (double)w,
(double)h);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- interface.c 19 Jan 2007 14:40:07 -0000 1.14
+++ interface.c 20 Jan 2007 05:13:02 -0000 1.15
@@ -5,7 +5,9 @@
#include "callbacks.h"
#include "interface.h"
-void ShowAlert(char* text){
+void
+ShowAlert(char* text)
+{
etk_message_dialog_text_set (ETK_MESSAGE_DIALOG(UI_AlertDialog), text);
etk_widget_show_all(UI_AlertDialog);
}
@@ -81,7 +83,6 @@
snprintf(buf,4096,"%s %.2f",state->name,state->value);
stock_key = etk_stock_key_get(ETK_STOCK_TEXT_X_GENERIC, ETK_STOCK_SMALL);
row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
- //part->user_data,
ecore_hash_get(hash,state->parent),
col1,EdjeFile,"DESC.PNG",buf,
col2,TRUE,
@@ -517,9 +518,7 @@
void
UpdatePositionFrame(void)
{
- //Engrave_Part_State *state = selected_desc;
-
- printf("Update Position: %s (offset:
%d)\n",Cur.eps->name,Cur.eps->rel1.offset.x);
+ //printf("Update Position: %s (offset:
%d)\n",Cur.eps->name,Cur.eps->rel1.offset.x);
//Stop signal propagation
etk_signal_block("value_changed", ETK_OBJECT(UI_Rel1XSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed));
@@ -550,14 +549,11 @@
etk_signal_unblock("value_changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed));
etk_signal_unblock("value_changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed));
etk_signal_unblock("value_changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed));
-
}
void
UpdateComboPositionFrame(void)
{
- //Engrave_Part_State *state = selected_desc;
- //GString *str=g_string_new("");
int i=0;
Etk_Combobox_Item *item = NULL;
Engrave_Part *part = NULL;
@@ -568,14 +564,6 @@
etk_signal_block("active_item_changed", ETK_OBJECT(UI_Rel2ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed));
etk_signal_block("active_item_changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed));
-
-
- // Set RelTo combos
- //If rel1_to is know set rel1_to_x and rel1_to_y
- //if (desc->rel1_to->len > 0){
- //desc->rel1_to_x = desc->rel1_to;
- //desc->rel1_to_y = desc->rel1_to;
- //}
printf("SETTING COMBOS %s\n", Cur.eps->rel1.to_x);
//If rel1_to_x is know set the combobox
if (Cur.eps->rel1.to_x)
@@ -613,12 +601,6 @@
}
}else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),0));}
- //If rel2_to is know set rel2_to_x and rel2_to_y
- //if (desc->rel2_to->len > 0){
- // desc->rel2_to_x = desc->rel2_to;
- // desc->rel2_to_y = desc->rel2_to;
- //}
-
//If rel2_to_x is know set the combobox
if (Cur.eps->rel2.to_x)
{
@@ -1804,7 +1786,6 @@
etk_signal_connect("color_changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
etk_signal_connect("delete_event", ETK_OBJECT(UI_ColorWin),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_signal_connect("destroyed", ETK_OBJECT(UI_MainWin),
ETK_CALLBACK(etk_main_quit_cb), NULL);
- // etk_signal_connect("active_item_changed", ETK_OBJECT(UI_GroupComboBox),
ETK_CALLBACK(on_GroupComboBox_changed), NULL);
etk_object_notification_callback_add(ETK_OBJECT(ETK_canvas), "geometry",
on_canvas_geometry_changed, NULL);
etk_widget_show_all(ETK_WIDGET(UI_MainWin));
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
