rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e_client_util_is_stacking() -> e_client_is_stacking() 

regrettably, this can't be in e_client.x because it needs E_Comp struct members and header order does not allow for this :(
This commit is contained in:
Mike Blumenkrantz 2014-02-05 10:58:57 -05:00
parent 8d71213839
commit 569c90e87f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_client.c
View File

@ -4456,9 +4456,8 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set)
////////////////////////////////////////////
EAPI Eina_Bool
e_client_util_is_stacking(const E_Client *ec)
e_client_is_stacking(const E_Client *ec)
{
return ec->comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
}

2
src/bin/e_client.h
View File

@ -798,6 +798,6 @@ EAPI E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude);
EAPI int e_client_pointer_warp_to_center_now(E_Client *ec);
EAPI int e_client_pointer_warp_to_center(E_Client *ec);
EAPI void e_client_redirected_set(E_Client *ec, Eina_Bool set);
EAPI Eina_Bool e_client_util_is_stacking(const E_Client *ec);
EAPI Eina_Bool e_client_is_stacking(const E_Client *ec);
#include "e_client.x"
#endif

10
src/bin/e_comp_x.c
View File

@ -606,7 +606,7 @@ _e_comp_x_client_stack(E_Client *ec)
Eina_List *l;
if (ec->override && (!ec->internal)) return; //can't restack these
if (e_client_util_is_stacking(ec)) return;
if (e_client_is_stacking(ec)) return;
if (!ec->comp_data) return;
if (ec->comp_data->unredirected_single) return;
@ -617,7 +617,7 @@ _e_comp_x_client_stack(E_Client *ec)
do
{
ec2 = e_client_above_get(ec2);
if (ec2 && (e_client_util_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
if (ec2 && (e_client_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
{
if (ec2->layer != ec->layer) break;
win = _e_comp_x_client_window_get(ec2);
@ -631,7 +631,7 @@ _e_comp_x_client_stack(E_Client *ec)
do
{
ec2 = e_client_below_get(ec2);
if (ec2 && (e_client_util_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
if (ec2 && (e_client_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
{
if (ec2->layer != ec->layer) break;
win = _e_comp_x_client_window_get(ec2);
@ -1359,7 +1359,7 @@ _e_comp_x_configure(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_
if (ec2)
{
/* client(ec) wants to be above a layer client(ec2) */
if (e_client_util_is_stacking(ec2)) //is it a stacking placeholder window?
if (e_client_is_stacking(ec2)) //is it a stacking placeholder window?
{
E_Client *ec3;
@ -1368,7 +1368,7 @@ _e_comp_x_configure(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_
if (ec3)
{
evas_object_layer_set(ec->frame, ec3->layer);
if (!e_client_util_is_stacking(ec3))
if (!e_client_is_stacking(ec3))
evas_object_stack_below(ec->frame, ec3->frame);
}
else //force override to obey our stacking