[gtk+/wip/csd-for-review] Hardcode no border when maximized

[Matthias Clasen <matthiasc src gnome org>]

commit acc912755edb6f824f78b6740b243b22e293b198
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 10 11:51:57 2013 -0400

    Hardcode no border when maximized
    
    It doesn't seem worth an extra style class, having a border
    when maximized basically makes not sense.

 gtk/gtkwindow.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index d5233dc..d93c9d8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5862,14 +5862,19 @@ get_decoration_borders (GtkWidget *widget,
 
   if (window_border)
     {
-      gtk_style_context_save (context);
       window = gtk_widget_get_window (widget);
       if (window != NULL && (gdk_window_get_state (window) & GDK_WINDOW_STATE_MAXIMIZED) != 0)
-        gtk_style_context_add_class (context, "window-border-maximized");
+        {
+           GtkBorder empty = { 0 };
+           *window_border = empty;
+         }
       else
-        gtk_style_context_add_class (context, "window-border");
-      gtk_style_context_get_border (context, state, window_border);
-      gtk_style_context_restore (context);
+        {
+          gtk_style_context_save (context);
+          gtk_style_context_add_class (context, "window-border");
+          gtk_style_context_get_border (context, state, window_border);
+          gtk_style_context_restore (context);
+        }
     }
 }
 
@@ -8755,12 +8760,10 @@ gtk_window_draw (GtkWidget *widget,
       if (priv->client_decorated &&
           priv->decorated &&
           priv->type == GTK_WINDOW_TOPLEVEL &&
-          !priv->fullscreen)
+          !priv->fullscreen &&
+          !(gdk_window_get_state (gtk_widget_get_window (widget)) & GDK_WINDOW_STATE_MAXIMIZED))
         {
-          if (gdk_window_get_state (gtk_widget_get_window (widget)) & GDK_WINDOW_STATE_MAXIMIZED)
-            gtk_style_context_add_class (context, "window-border-maximized");
-          else
-            gtk_style_context_add_class (context, "window-border");
+          gtk_style_context_add_class (context, "window-border");
           gtk_widget_get_allocation (widget, &allocation);
           gtk_render_background (context, cr,
                                  window_border.left,