force server borders on internal wl wins again

this goes back to previous behavior before elm win conversion
This commit is contained in:
Mike Blumenkrantz 2015-01-23 14:10:16 -05:00
parent 665a399b14
commit 03c5915245
2 changed files with 4 additions and 7 deletions

View File

@ -73,6 +73,7 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
{
type = E_PIXMAP_TYPE_WL;
ctx->pointer = e_comp->pointer;
elm_win_borderless_set(o, 1);
}
else
{

View File

@ -274,8 +274,6 @@ _e_shell_surface_cb_toplevel_set(struct wl_client *client EINA_UNUSED, struct wl
ec->no_shape_cut = EINA_TRUE;
ec->borderless = !ec->internal;
if ((ec->internal_elm_win) || (ec->override))
ec->borderless = EINA_TRUE;
ec->lock_border = EINA_TRUE;
ec->border.changed = ec->changes.border = !ec->borderless;
@ -342,7 +340,7 @@ _e_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED, struct wl_re
ec->argb = EINA_TRUE;
ec->no_shape_cut = EINA_TRUE;
ec->borderless = EINA_TRUE;
ec->borderless = !ec->internal_elm_win;
ec->lock_border = EINA_TRUE;
ec->border.changed = ec->changes.border = !ec->borderless;
ec->changes.icon = !!ec->icccm.class;
@ -1198,9 +1196,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
/* set toplevel client properties */
ec->argb = EINA_TRUE;
ec->no_shape_cut = EINA_TRUE;
ec->borderless = !ec->internal;
if ((ec->internal_elm_win) || (ec->override))
ec->borderless = EINA_TRUE;
ec->borderless = !ec->internal_elm_win;
ec->lock_border = EINA_TRUE;
ec->border.changed = ec->changes.border = !ec->borderless;
ec->netwm.type = E_WINDOW_TYPE_NORMAL;
@ -1312,7 +1308,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
ec->argb = EINA_TRUE;
ec->no_shape_cut = EINA_TRUE;
ec->borderless = EINA_TRUE;
ec->borderless = !ec->internal_elm_win;
ec->lock_border = EINA_TRUE;
ec->border.changed = ec->changes.border = !ec->borderless;
ec->changes.icon = !!ec->icccm.class;