From 03c59152450ad8929d4d0746187491cd83c1724a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 23 Jan 2015 14:10:16 -0500 Subject: [PATCH] force server borders on internal wl wins again this goes back to previous behavior before elm win conversion --- src/bin/e_win.c | 1 + src/modules/wl_desktop_shell/e_mod_main.c | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/e_win.c b/src/bin/e_win.c index fdcee07..d5f1a9f 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -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 { diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index d91ca57..0645fad 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -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; -- 2.7.4