From a5aaf5cc934751222c4ad1800019a8039af1f89d Mon Sep 17 00:00:00 2001
From: sebastid <sebastid>
Date: Mon, 12 Jun 2006 05:17:10 +0000
Subject: [PATCH] Add a flag for borderless, don't change the name directly.

SVN revision: 23391
---
 TODO                        |  1 -
 src/bin/e_border.c          |  2 +-
 src/bin/e_border.h          |  1 +
 src/bin/e_int_border_menu.c | 11 ++++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 23f3e574f..8affbd286 100644
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@ Some of the things (in very short form) that need to be done to E17...
   BUGS / FIXES
 -------------------------------------------------------------------------------
 
-* BUG: set a window to borderless - maximize it, and it gets its border back.
 * BUG: change exe name in basic mode in eap editor and icon vanishes (don't
   extract existing icon and write out to tmp .png while rebuilding).
 * BUG: resolution (xrandr) changes seem to screw the shelf up a bit.
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index fcbc80831..e03308808 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5167,7 +5167,7 @@ _e_border_eval(E_Border *bd)
 	
 	if (!bd->client.border.name)
 	  {
-	     if (bd->client.mwm.borderless)
+	     if ((bd->client.mwm.borderless) || (bd->borderless))
 	       bd->client.border.name = evas_stringshare_add("borderless");
 	     else if (((bd->client.icccm.transient_for != 0) ||
 		       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)) &&
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 4cff1b4d6..e14f072b9 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -340,6 +340,7 @@ struct _E_Border
    unsigned int    user_skip_winlist : 1;
    unsigned int    need_maximize : 1;
    E_Maximize      maximized;
+   unsigned int    borderless : 1;
 
    unsigned int    lock_user_location : 1; /*DONE*/
    unsigned int    lock_client_location : 1; /*DONE*/
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index 221eacf5e..1afbe53f6 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -647,14 +647,19 @@ _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi)
    bd = data;
    if (!bd) return;
    
-   if ((!bd->lock_border) && (!bd->shaded))
+   if (!bd->lock_border)
      {
 	if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
 	toggle = e_menu_item_toggle_get(mi);
+	if (bd->client.border.name)
+	  {
+	     evas_stringshare_del(bd->client.border.name);
+	     bd->client.border.name = NULL;
+	  }
 	if (toggle)
-	  bd->client.border.name = evas_stringshare_add("borderless");
+	  bd->borderless = 1;
 	else
-	  bd->client.border.name = evas_stringshare_add("default");
+	  bd->borderless = 0;
 	bd->client.border.changed = 1;
 	bd->changed = 1;
      }