[EGIT] [core/enlightenment] master 01/01: Revert "simplify/fix wl client borderless setting"

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=a8bd9df733349c69ff075365348136d91894d71d

commit a8bd9df733349c69ff075365348136d91894d71d
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jan 23 16:30:28 2015 -0500

    Revert "simplify/fix wl client borderless setting"
    
    This reverts commit 1b3d89c4c0f9e6c6358a972876ed9b0be4ad68ce.
    
    I suck too much to fix this right now, maybe later
---
 src/modules/wl_desktop_shell/e_mod_main.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c 
b/src/modules/wl_desktop_shell/e_mod_main.c
index 2c965c8..0645fad 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -273,9 +273,10 @@ _e_shell_surface_cb_toplevel_set(struct wl_client *client 
EINA_UNUSED, struct wl
    ec->argb = EINA_TRUE;
    ec->no_shape_cut = EINA_TRUE;
 
-   if (ec->internal_elm_win && (!ec->borderless))
-     ec->lock_border = ec->borderless = 1;
+   ec->borderless = !ec->internal;
 
+   ec->lock_border = EINA_TRUE;
+   ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_NORMAL;
    ec->comp_data->set_win_type = EINA_TRUE;
    if ((!ec->lock_user_maximize) && (ec->maximized))
@@ -339,8 +340,9 @@ _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;
-   if (ec->internal_elm_win && (!ec->borderless))
-     ec->lock_border = ec->borderless = 1;
+   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;
    ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
    ec->comp_data->set_win_type = EINA_TRUE;
@@ -1194,8 +1196,9 @@ _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;
-   if (ec->internal_elm_win && (!ec->borderless))
-     ec->lock_border = ec->borderless = 1;
+   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;
    ec->comp_data->set_win_type = EINA_TRUE;
    EC_CHANGED(ec);
@@ -1305,8 +1308,9 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, 
struct wl_resource *resource
 
    ec->argb = EINA_TRUE;
    ec->no_shape_cut = EINA_TRUE;
-   if (ec->internal_elm_win && (!ec->borderless))
-     ec->lock_border = ec->borderless = 1;
+   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;
    ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
    ec->comp_data->set_win_type = EINA_TRUE;

--