Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_dnd.c ewl_grid.c ewl_tree2.c ewl_view.h
Log Message:
- formatting
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_dnd.c 25 Mar 2007 04:57:09 -0000 1.44
+++ ewl_dnd.c 26 Mar 2007 02:21:56 -0000 1.45
@@ -14,25 +14,19 @@
int EWL_CALLBACK_DND_DATA_REQUEST; /**< Data request event **/
static int ewl_dragging_current;
-static int ewl_dnd_move_count;
+static int ewl_dnd_status;
static Ewl_Widget *ewl_dnd_widget;
static Ewl_Widget *ewl_dnd_default_cursor;
static Ecore_Hash *ewl_dnd_provided_hash;
static Ecore_Hash *ewl_dnd_accepted_hash;
-static int ewl_dnd_status;
static char *ewl_dnd_types_encode(const char **types);
static char **ewl_dnd_types_decode(const char *types);
static char * ewl_dnd_type_stpcpy(char *dst, const char *src);
static int ewl_dnd_types_encoded_contains(char *types, char *type);
-#if 0
-static int ewl_dnd_event_mouse_up(void *data, int type, void *event);
-static int ewl_dnd_event_dnd_move(void *data, int type, void *event);
-#endif
-
/**
* @internal
* @return Returns TRUE if the DND system was successfully initialized,
@@ -51,11 +45,6 @@
EWL_CALLBACK_DND_DATA_RECEIVED = ewl_callback_type_add();
EWL_CALLBACK_DND_DATA_REQUEST = ewl_callback_type_add();
- ewl_dnd_widget = NULL;
- ewl_dnd_status = 0;
- ewl_dragging_current = 0;
- ewl_dnd_move_count = 0;
-
ewl_dnd_provided_hash = ecore_hash_new(ecore_direct_hash,
ecore_direct_compare);
if (!ewl_dnd_provided_hash)
@@ -66,8 +55,8 @@
if (!ewl_dnd_accepted_hash)
goto ACCEPTED_ERROR;
+ ewl_dnd_widget = NULL;
ewl_dnd_default_cursor = NULL;
-
ewl_dragging_current = 0;
ewl_dnd_status = 1;
@@ -289,7 +278,6 @@
ewl_dragging_current = 1;
ewl_dnd_widget = w;
- ewl_dnd_move_count = 0;
types = ewl_dnd_provided_types_get(w);
/*
@@ -343,7 +331,6 @@
ewl_dragging_current = 0;
ewl_dnd_widget = NULL;
- ewl_dnd_move_count = 0;
emb = ewl_embed_widget_find(w);
if (!emb) DRETURN(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_grid.c 24 Mar 2007 23:35:59 -0000 1.37
+++ ewl_grid.c 26 Mar 2007 02:21:56 -0000 1.38
@@ -533,9 +533,8 @@
DWARNING("parameter 'col' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (col >= g->cols) {
+ else if (col >= g->cols)
ewl_grid_dimensions_set(g, col + 1, g->rows);
- }
g->col_size[col].resize_type = EWL_GRID_RESIZE_FIXED;
g->col_size[col].user.size = width;
@@ -588,9 +587,8 @@
DWARNING("parameter 'col' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (col >= g->cols) {
+ else if (col >= g->cols)
ewl_grid_dimensions_set(g, col + 1, g->rows);
- }
g->col_size[col].resize_type = EWL_GRID_RESIZE_RELATIVE;
g->col_size[col].user.rel_size = relw;
@@ -642,9 +640,8 @@
DWARNING("parameter 'col' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (col >= g->cols) {
+ else if (col >= g->cols)
ewl_grid_dimensions_set(g, col + 1, g->rows);
- }
g->col_size[col].resize_type = EWL_GRID_RESIZE_NONE;
g->col_size[col].user.size = 0;
@@ -675,9 +672,8 @@
DWARNING("parameter 'col' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (col >= g->cols) {
+ else if (col >= g->cols)
ewl_grid_dimensions_set(g, col + 1, g->rows);
- }
g->col_size[col].resize_type = EWL_GRID_RESIZE_NORMAL;
g->col_size[col].user.size = 0;
@@ -730,9 +726,8 @@
DWARNING("parameter 'row' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (row >= g->rows) {
+ else if (row >= g->rows)
ewl_grid_dimensions_set(g, g->cols, row + 1);
- }
g->row_size[row].resize_type = EWL_GRID_RESIZE_FIXED;
g->row_size[row].user.size = height;
@@ -785,9 +780,8 @@
DWARNING("parameter 'row' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (row >= g->rows) {
+ else if (row >= g->rows)
ewl_grid_dimensions_set(g, g->cols, row + 1);
- }
g->row_size[row].resize_type = EWL_GRID_RESIZE_RELATIVE;
g->row_size[row].user.rel_size = relh;
@@ -839,9 +833,8 @@
DWARNING("parameter 'row' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (row >= g->rows) {
+ else if (row >= g->rows)
ewl_grid_dimensions_set(g, g->cols, row + 1);
- }
g->row_size[row].resize_type = EWL_GRID_RESIZE_NONE;
g->row_size[row].user.size = 0;
@@ -872,9 +865,8 @@
DWARNING("parameter 'row' is out of bounds.");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
- else if (row >= g->rows) {
+ else if (row >= g->rows)
ewl_grid_dimensions_set(g, g->cols, row + 1);
- }
g->row_size[row].resize_type = EWL_GRID_RESIZE_NORMAL;
g->row_size[row].user.size = 0;
@@ -1034,6 +1026,7 @@
&& k < g->rows; k++)
g->map[g->cols * k + l] = 1;
}
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1134,9 +1127,9 @@
if (g->homogeneous_h) {
int i, size;
- for (i = 0, size = 0; i < g->cols; i++) {
+ for (i = 0, size = 0; i < g->cols; i++)
size = MAX(size, g->col_size[i].preferred_size);
- }
+
ewl_object_preferred_inner_w_set(EWL_OBJECT(g), size * g->cols);
}
else {
@@ -1150,9 +1143,11 @@
case EWL_GRID_RESIZE_RELATIVE:
rel += g->col_size[i].user.rel_size;
break;
+
case EWL_GRID_RESIZE_FIXED:
fixed += g->col_size[i].user.size;
break;
+
default:
fixed += g->col_size[i].preferred_size;
}
@@ -1180,9 +1175,11 @@
case EWL_GRID_RESIZE_RELATIVE:
rel += g->row_size[i].user.rel_size;
break;
+
case EWL_GRID_RESIZE_FIXED:
fixed += g->row_size[i].user.size;
break;
+
default:
fixed += g->row_size[i].preferred_size;
}
@@ -1241,16 +1238,19 @@
g->col_size[i].user.rel_size
* new_w;
break;
+
case EWL_GRID_RESIZE_FIXED:
fixed += g->col_size[i].user.size;
g->col_size[i].current_size =
g->col_size[i].user.size;
break;
+
case EWL_GRID_RESIZE_NONE:
fixed += g->col_size[i].preferred_size;
g->col_size[i].current_size =
g->col_size[i].preferred_size;
break;
+
default:
var += g->col_size[i].preferred_size;
@@ -1295,16 +1295,19 @@
g->row_size[i].user.rel_size
* new_h;
break;
+
case EWL_GRID_RESIZE_FIXED:
fixed += g->row_size[i].user.size;
g->row_size[i].current_size =
g->row_size[i].user.size;
break;
+
case EWL_GRID_RESIZE_NONE:
fixed += g->row_size[i].preferred_size;
g->row_size[i].current_size =
g->row_size[i].preferred_size;
break;
+
default:
var += g->row_size[i].preferred_size;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- ewl_tree2.c 25 Mar 2007 04:57:09 -0000 1.70
+++ ewl_tree2.c 26 Mar 2007 02:21:56 -0000 1.71
@@ -24,7 +24,8 @@
static void ewl_tree2_cb_row_clicked(Ewl_Widget *w, void *ev, void *data);
static void ewl_tree2_cb_cell_clicked(Ewl_Widget *w, void *ev, void *data);
static void ewl_tree2_cb_selected_change(Ewl_MVC *mvc);
-static Ewl_Widget *ewl_tree2_widget_at(Ewl_MVC *mvc, void *data, int row, int
column);
+static Ewl_Widget *ewl_tree2_widget_at(Ewl_MVC *mvc, void *data,
+ int row, int column);
static void ewl_tree2_create_expansions_hash(Ewl_Tree2 *tree);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_view.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_view.h 24 Mar 2007 23:25:43 -0000 1.13
+++ ewl_view.h 26 Mar 2007 02:21:56 -0000 1.14
@@ -45,7 +45,7 @@
typedef struct Ewl_View Ewl_View;
/**
- * @def EWL_VIEW_EXPANSION_VIEW_FETCH(f)
+ * @def EWL_VIEW_EXPANSION_VIEW_FETCH_GET(f)
* View callback to get a view for expanded data on a row
*/
#define EWL_VIEW_EXPANSION_VIEW_FETCH_GET(f) ((Ewl_View_Expansion_View_Fetch)f)
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
