forked from enlightenment/enlightenment
Raise the border on click, even if move/resize is disabled.
Don't make the container black, need to do this pr. desk. SVN revision: 15420
This commit is contained in:
parent
cfe111cbe1
commit
0eeb25b536
|
@ -1093,6 +1093,9 @@ e_border_maximize(E_Border *bd)
|
||||||
e_border_raise(bd);
|
e_border_raise(bd);
|
||||||
switch (e_config->maximize_policy)
|
switch (e_config->maximize_policy)
|
||||||
{
|
{
|
||||||
|
case E_MAXIMIZE_NONE:
|
||||||
|
/* Ignore */
|
||||||
|
break;
|
||||||
case E_MAXIMIZE_ZOOM:
|
case E_MAXIMIZE_ZOOM:
|
||||||
/* FIXME */
|
/* FIXME */
|
||||||
break;
|
break;
|
||||||
|
@ -1195,6 +1198,9 @@ e_border_unmaximize(E_Border *bd)
|
||||||
|
|
||||||
switch (bd->maximized)
|
switch (bd->maximized)
|
||||||
{
|
{
|
||||||
|
case E_MAXIMIZE_NONE:
|
||||||
|
/* Ignore */
|
||||||
|
break;
|
||||||
case E_MAXIMIZE_ZOOM:
|
case E_MAXIMIZE_ZOOM:
|
||||||
/* FIXME */
|
/* FIXME */
|
||||||
break;
|
break;
|
||||||
|
@ -1232,7 +1238,7 @@ e_border_unmaximize(E_Border *bd)
|
||||||
/* FIXME */
|
/* FIXME */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
bd->maximized = 0;
|
bd->maximized = E_MAXIMIZE_NONE;
|
||||||
|
|
||||||
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w, bd->saved.h);
|
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w, bd->saved.h);
|
||||||
|
|
||||||
|
@ -1255,9 +1261,6 @@ e_border_fullscreen(E_Border *bd)
|
||||||
{
|
{
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
// printf("FULLSCREEEN!\n");
|
// printf("FULLSCREEEN!\n");
|
||||||
/* make container bg black and show it */
|
|
||||||
e_container_bg_black(bd->zone->container);
|
|
||||||
|
|
||||||
bd->saved.x = bd->x;
|
bd->saved.x = bd->x;
|
||||||
bd->saved.y = bd->y;
|
bd->saved.y = bd->y;
|
||||||
bd->saved.w = bd->w;
|
bd->saved.w = bd->w;
|
||||||
|
@ -1295,9 +1298,6 @@ e_border_unfullscreen(E_Border *bd)
|
||||||
if (bd->fullscreen)
|
if (bd->fullscreen)
|
||||||
{
|
{
|
||||||
// printf("UNFULLSCREEEN!\n");
|
// printf("UNFULLSCREEEN!\n");
|
||||||
/* make container bg white and hide it */
|
|
||||||
e_container_bg_white(bd->zone->container);
|
|
||||||
|
|
||||||
e_hints_window_fullscreen_set(bd, 0);
|
e_hints_window_fullscreen_set(bd, 0);
|
||||||
bd->fullscreen = 0;
|
bd->fullscreen = 0;
|
||||||
|
|
||||||
|
@ -1555,7 +1555,6 @@ e_border_act_move_begin(E_Border *bd, Ecore_X_Event_Mouse_Button_Down *ev)
|
||||||
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
|
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
|
||||||
_e_border_moveinfo_gather(bd, source);
|
_e_border_moveinfo_gather(bd, source);
|
||||||
}
|
}
|
||||||
e_border_raise(bd);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1610,7 +1609,6 @@ e_border_act_resize_begin(E_Border *bd, Ecore_X_Event_Mouse_Button_Down *ev)
|
||||||
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
|
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
|
||||||
_e_border_moveinfo_gather(bd, source);
|
_e_border_moveinfo_gather(bd, source);
|
||||||
}
|
}
|
||||||
e_border_raise(bd);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2649,7 +2647,6 @@ _e_border_cb_signal_move_start(void *data, Evas_Object *obj, const char *emissio
|
||||||
return;
|
return;
|
||||||
bd->moving = 1;
|
bd->moving = 1;
|
||||||
_e_border_moveinfo_gather(bd, source);
|
_e_border_moveinfo_gather(bd, source);
|
||||||
e_border_raise(bd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -5025,6 +5022,7 @@ _e_border_resize_begin(E_Border *bd)
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
||||||
|
e_border_raise(bd);
|
||||||
if ((bd->shaded) || (bd->shading) ||
|
if ((bd->shaded) || (bd->shading) ||
|
||||||
(bd->maximized) || (bd->fullscreen))
|
(bd->maximized) || (bd->fullscreen))
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -5099,6 +5097,7 @@ _e_border_resize_update(E_Border *bd)
|
||||||
static int
|
static int
|
||||||
_e_border_move_begin(E_Border *bd)
|
_e_border_move_begin(E_Border *bd)
|
||||||
{
|
{
|
||||||
|
e_border_raise(bd);
|
||||||
if ((bd->maximized) || (bd->fullscreen))
|
if ((bd->maximized) || (bd->fullscreen))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -292,26 +292,6 @@ e_container_lower(E_Container *con)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
e_container_bg_black(E_Container *con)
|
|
||||||
{
|
|
||||||
Evas_Object *o;
|
|
||||||
|
|
||||||
o = con->bg_blank_object;
|
|
||||||
evas_object_layer_set(o, 100);
|
|
||||||
evas_object_color_set(o, 0, 0, 0, 255);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
e_container_bg_white(E_Container *con)
|
|
||||||
{
|
|
||||||
Evas_Object *o;
|
|
||||||
|
|
||||||
o = con->bg_blank_object;
|
|
||||||
evas_object_layer_set(o, -100);
|
|
||||||
evas_object_color_set(o, 255, 255, 255, 255);
|
|
||||||
}
|
|
||||||
|
|
||||||
E_Zone *
|
E_Zone *
|
||||||
e_container_zone_at_point_get(E_Container *con, int x, int y)
|
e_container_zone_at_point_get(E_Container *con, int x, int y)
|
||||||
{
|
{
|
||||||
|
|
|
@ -98,9 +98,6 @@ EAPI void e_container_resize(E_Container *con, int w, int h);
|
||||||
EAPI void e_container_move_resize(E_Container *con, int x, int y, int w, int h);
|
EAPI void e_container_move_resize(E_Container *con, int x, int y, int w, int h);
|
||||||
EAPI void e_container_raise(E_Container *con);
|
EAPI void e_container_raise(E_Container *con);
|
||||||
EAPI void e_container_lower(E_Container *con);
|
EAPI void e_container_lower(E_Container *con);
|
||||||
EAPI void e_container_bg_black(E_Container *con);
|
|
||||||
EAPI void e_container_bg_white(E_Container *con);
|
|
||||||
|
|
||||||
|
|
||||||
EAPI E_Border_List *e_container_border_list_first(E_Container *con);
|
EAPI E_Border_List *e_container_border_list_first(E_Container *con);
|
||||||
EAPI E_Border_List *e_container_border_list_last(E_Container *con);
|
EAPI E_Border_List *e_container_border_list_last(E_Container *con);
|
||||||
|
|
Loading…
Reference in New Issue