X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=361d57cd8a01a9fbb034a3e798bebcc9fb180750;hb=4398c7c168fdcba1e31afc465d9783a57e7e674a;hp=6830ab73e25c74f813fa58a1271887678eb8ce22;hpb=8fbc68d46dc6bf99162daee24b72355293f561c6;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 6830ab73..361d57cd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -747,7 +747,8 @@ void client_setup_decor_and_functions(Client *self)
 {
     /* start with everything (cept fullscreen) */
     self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
-	Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
+	Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize |
+        Decor_Shade;
     self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
 	Func_Shade;
     if (self->delete_window) {
@@ -842,6 +843,8 @@ void client_setup_decor_and_functions(Client *self)
 	self->decorations &= ~Decor_Maximize;
     if (self->disabled_decorations & Decor_AllDesktops)
 	self->decorations &= ~Decor_AllDesktops;
+    if (self->disabled_decorations & Decor_Shade)
+	self->decorations &= ~Decor_Shade;
     if (self->disabled_decorations & Decor_Close)
 	self->decorations &= ~Decor_Close;
 
@@ -1613,13 +1616,6 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
 	    PROP_SET32A(self->window, openbox_premax, cardinal,
 			dimensions, 4);
 	}
-
-        /* pass the client's current position info. the client_configure
-           will move/size stuff as appropriate for a maximized window */
-        x = self->area.x;
-        y = self->area.y;
-        w = self->area.width;
-        h = self->area.height;
     } else {
 	long *dimensions;
 
@@ -1666,7 +1662,7 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
 
 void client_shade(Client *self, gboolean shade)
 {
-    if (!(self->functions & Func_Shade) || /* can't */
+    if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
 	self->shaded == shade) return;     /* already done */
 
     /* when we're iconic, don't change the wmstate */