bonobo-wrapper patch

[Maciej Stachowiak <mjs eazel com>]

I checked this in while the list was down.


2000-03-07  Maciej Stachowiak  <mjs@eazel.com>

	* bonobo/bonobo-wrapper.c (bonobo_wrapper_size_request): Correct
	the logic for when to add space for the border: only when the
	cover is off and the squiggle is visible.
	(bonobo_wrapper_size_allocate): Likewise.

Index: bonobo/bonobo-wrapper.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-wrapper.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bonobo/bonobo-wrapper.c	2000/02/14 20:42:52	1.12
+++ bonobo/bonobo-wrapper.c	2000/03/07 11:57:03	1.13
@@ -303,7 +303,7 @@
 		gtk_widget_size_request (wrapper->bin.child, 
 					 requisition);
 
-		if (! wrapper->priv->covered || ! wrapper->priv->visible) {
+		if (!wrapper->priv->covered && wrapper->priv->visible) {
 			requisition->width += BORDER_WIDTH * 2;
 			requisition->height += BORDER_WIDTH * 2;
 		}	
@@ -350,7 +350,7 @@
 		child_allocation.y = 0;
 		child_allocation.width = widget->allocation.width;
 		child_allocation.height = widget->allocation.height;
-		if (!wrapper->priv->covered || !wrapper->priv->visible) {
+		if (!wrapper->priv->covered && wrapper->priv->visible) {
 			child_allocation.x += BORDER_WIDTH;
 			child_allocation.y += BORDER_WIDTH;
 			child_allocation.width -= BORDER_WIDTH * 2;