[glade/margins] Changed margin step to 6 pixels Clean up gdl_update_max_margins()

[Juan Pablo Ugarte <jpu src gnome org>]

commit eae17fefa429487c9a8c5b31c3284d7492a30235
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Mon May 2 16:22:28 2011 -0300

    Changed margin step to 6 pixels
    Clean up gdl_update_max_margins()

 gladeui/glade-design-layout.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gladeui/glade-design-layout.c b/gladeui/glade-design-layout.c
index 1c847c1..e6dfdba 100644
--- a/gladeui/glade-design-layout.c
+++ b/gladeui/glade-design-layout.c
@@ -42,7 +42,7 @@
 #define OUTLINE_WIDTH     4
 #define PADDING           10
 
-#define MARGIN_STEP       8
+#define MARGIN_STEP       6
 
 typedef enum
 {
@@ -236,7 +236,6 @@ gdl_update_max_margins (GladeDesignLayout *layout,
   gint parent_w, parent_h, layout_w, layout_h;
   gint top, bottom, left, right;
   GtkRequisition req;
-  GtkWidget *parent;
   
   gtk_widget_get_preferred_size (child, &req, NULL);
 
@@ -244,23 +243,21 @@ gdl_update_max_margins (GladeDesignLayout *layout,
   bottom = gtk_widget_get_margin_bottom (priv->selection);
   left = gtk_widget_get_margin_left (priv->selection);
   right = gtk_widget_get_margin_right (priv->selection);
-
-  parent = gtk_widget_get_parent (GTK_WIDGET (priv->view));
   
   priv->max_width = width - (req.width - left - right);
 
-  parent_w = gtk_widget_get_allocated_width (parent);
+  parent_w = gtk_widget_get_allocated_width (GTK_WIDGET (priv->view));
   layout_w = gtk_widget_get_allocated_width (GTK_WIDGET (layout));
 
   if (parent_w > layout_w)
-    priv->max_width += parent_w - layout_w - PADDING;
+    priv->max_width += parent_w - layout_w - (PADDING - OUTLINE_WIDTH);
   
   priv->max_height = height - (req.height - top - bottom) ;
 
-  parent_h = gtk_widget_get_allocated_height (parent);
+  parent_h = gtk_widget_get_allocated_height (GTK_WIDGET (priv->view));
   layout_h = gtk_widget_get_allocated_height (GTK_WIDGET (layout));
   if (parent_h > layout_h)
-    priv->max_height += parent_h - layout_h - priv->south_east.height - OUTLINE_WIDTH - priv->child_offset;
+    priv->max_height += parent_h - layout_h - (PADDING - OUTLINE_WIDTH);
 }
 
 static void