[EGIT] [core/enlightenment] master 01/01: Revert "only set wl client borderless state as necessary, don't overwrite existing states"

[Christopher Michael]

devilhorns pushed a commit to branch master.

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

commit fba5de7d6a53c9ad931c1389a4810cd3c9f8a44c
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Fri Jan 23 14:57:04 2015 -0500

    Revert "only set wl client borderless state as necessary, don't overwrite 
existing states"
    
    This reverts commit 5c80ce8e0ed530395c81c771a883817203fe06eb.
    
    Revert this as it causes ALL internal windows to not have any borders
    anymore.
---
 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 decb87e..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->lock_border = ec->border.changed = ec->changes.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->lock_border = ec->border.changed = ec->changes.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->lock_border = ec->border.changed = ec->changes.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->lock_border = ec->border.changed = ec->changes.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;

--