enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

formatting for seb 

SVN revision: 77880
This commit is contained in:
Mike Blumenkrantz 2012-10-11 13:23:14 +00:00
parent bc3d8d18e2
commit 6134584e47
4 changed files with 1003 additions and 998 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/e_border.c
View File

@ -1079,11 +1079,14 @@ e_border_hide(E_Border *bd,
switch (manage)
{
case 2: break;
case 3:
bd->hidden = 1;
case 1:
/* Make sure that this border isn't deleted */
bd->await_hide_event++;
default:
if (!e_manager_comp_evas_get(bd->zone->container->manager))
ecore_x_window_hide(bd->client.win);
@ -1377,7 +1380,8 @@ _e_border_move_internal(E_Border *bd,
bd->move_intercept_cb(bd, x, y);
if ((bd->x == px) && (bd->y == py)) return;
}
else if ((x == bd->x) && (y == bd->y)) return;
else if ((x == bd->x) && (y == bd->y))
return;
bd->pre_res_change.valid = 0;
bd->x = x;
bd->y = y;
@ -1427,7 +1431,6 @@ e_border_move(E_Border *bd,
_e_border_reset_lost_window(bd);
}
/**
* Set a callback which will be called just prior to updating the
* move coordinates for a border
@ -2848,7 +2851,6 @@ e_border_maximize(E_Border *bd,
_e_border_maximize(bd, max);
/* Remove previous type */
bd->maximized &= ~E_MAXIMIZE_TYPE;
/* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
@ -6255,7 +6257,8 @@ _e_border_cb_config_icon_theme(void *data __UNUSED__,
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool _e_border_cb_config_mode(void *data __UNUSED__,
static Eina_Bool
_e_border_cb_config_mode(void *data __UNUSED__,
int ev_type __UNUSED__,
void *ev __UNUSED__)
{
@ -6678,6 +6681,7 @@ _e_border_stay_within_container(E_Border *bd, int x, int y, int *new_x, int *new
*new_y = 0;
}
}
static Eina_Bool
_e_border_cb_mouse_move(void *data,
int type __UNUSED__,
@ -6722,7 +6726,6 @@ _e_border_cb_mouse_move(void *data,
new_x = x;
new_y = y;
if (e_config->window_out_of_vscreen_limits_partly)
_e_border_stay_within_container(bd, x, y, &new_x, &new_y);
else
@ -8105,7 +8108,6 @@ _e_border_eval(E_Border *bd)
}
else if ((!bd->placed) && (bd->client.icccm.request_pos))
{
Ecore_X_Window_Attributes *att;
int bw;
@ -8965,7 +8967,8 @@ _e_border_shade_animator(void *data)
val = dt / dur;
if (val < 0.0) val = 0.0;
else if (val > 1.0) val = 1.0;
else if (val > 1.0)
val = 1.0;
if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL)
{
@ -9961,4 +9964,5 @@ e_border_activate(E_Border *bd, Eina_Bool just_do_it)
}
}
}
/*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/

5
src/modules/conf_window_manipulation/e_int_config_window_display.c
View File

@ -111,7 +111,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((e_config->window_placement_policy != cfdata->window_placement_policy) ||
return (e_config->window_placement_policy != cfdata->window_placement_policy) ||
(e_config->window_grouping != cfdata->window_grouping) ||
(e_config->move_info_visible != cfdata->move_info_visible) ||
(e_config->move_info_follows != cfdata->move_info_follows) ||
@ -123,7 +123,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(e_config->use_app_icon != cfdata->use_app_icon) ||
(e_config->desk_auto_switch != cfdata->desk_auto_switch) ||
(e_config->window_out_of_vscreen_limits != cfdata->window_out_of_vscreen_limits) ||
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly));
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly);
}
static Evas_Object *
@ -293,3 +293,4 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
EINA_LIST_FOREACH(list, l, o)
e_widget_disabled_set(o, disable);
}