brasero r794 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun May  4 18:54:37 2008
New Revision: 794
URL: http://svn.gnome.org/viewvc/brasero?rev=794&view=rev

Log:
	Fix for #519110 â Variable size of bottom widgets

	* src/brasero-project-size.c (brasero_project_size_size_request),
	(brasero_project_size_size_allocate),
	(brasero_project_size_expose):
	* src/burn-job.c:

Modified:
   trunk/ChangeLog
   trunk/src/brasero-project-size.c
   trunk/src/burn-job.c

Modified: trunk/src/brasero-project-size.c
==============================================================================
--- trunk/src/brasero-project-size.c	(original)
+++ trunk/src/brasero-project-size.c	Sun May  4 18:54:37 2008
@@ -621,13 +621,12 @@
 	brasero_project_size_get_ruler_min_width (self, &ruler_width, &ruler_height);
 	gtk_widget_size_request (self->priv->button, &req);
 
-	width = self->priv->frame->style->xthickness * 2 +
-		req.width * 2;
+	width = self->priv->frame->style->xthickness * 2 + req.width * 2;
 
 	height = extents.height + self->priv->frame->style->ythickness * 2;
 	height = MAX (height, req.height);
 	height += ruler_height;
-	
+
 	requisition->height = height > BRASERO_PROJECT_SIZE_HEIGHT ? height:BRASERO_PROJECT_SIZE_HEIGHT;
 	requisition->width = width;
 
@@ -666,7 +665,7 @@
 
 	alloc.y = - 1;
 	alloc.width = MAX (1, req.width + self->priv->frame->style->xthickness * 2 - 2);
-	alloc.height = MAX (req.height + self->priv->frame->style->xthickness * 2 - 2, allocation->height - self->priv->ruler_height);
+	alloc.height = MAX (req.height - 2, allocation->height - self->priv->ruler_height);
 	gtk_widget_size_allocate (self->priv->button, &alloc);
 
 	/* allocate the size for the arrow we want to draw on the button */
@@ -832,7 +831,7 @@
 	}
 	g_object_unref (layout);
 
-	bar_height = widget->allocation.height - text_height;
+	bar_height = widget->allocation.height - text_height - 2;
 
 	if (drive->medium
 	&& (brasero_medium_get_status (drive->medium) & BRASERO_MEDIUM_REWRITABLE)
@@ -863,7 +862,7 @@
 			    x,
 			    self->priv->frame->style->ythickness,
 			    width,
-			    bar_height - self->priv->frame->style->ythickness);
+			    bar_height - self->priv->frame->style->ythickness * 2);
 
 	if (fraction > 1.0) {
 		gint width2;
@@ -888,7 +887,7 @@
 				    x,
 				    self->priv->frame->style->ythickness,
 				    width2,
-				    bar_height - self->priv->frame->style->ythickness);
+				    bar_height - self->priv->frame->style->ythickness * 2);
 
 		if (fraction > 1.03) {
 			if (is_rtl)
@@ -906,7 +905,7 @@
 					    x,
 					    self->priv->frame->style->ythickness,
 					    bar_width - width - width2,
-					    bar_height - self->priv->frame->style->ythickness);
+					    bar_height - self->priv->frame->style->ythickness * 2);
 		}
 	}
 	else {
@@ -926,7 +925,7 @@
 				    x,
 				    self->priv->frame->style->ythickness,
 				    bar_width - width + self->priv->frame->style->xthickness,
-				    bar_height - self->priv->frame->style->ythickness);
+				    bar_height - self->priv->frame->style->ythickness * 2);
 	}
 
 	/* Frame around bar */

Modified: trunk/src/burn-job.c
==============================================================================
--- trunk/src/burn-job.c	(original)
+++ trunk/src/burn-job.c	Sun May  4 18:54:37 2008
@@ -82,10 +82,10 @@
 	BraseroJob *linked;
 };
 
-#define BRASERO_JOB_DEBUG(job)	brasero_job_log_message (job, G_STRLOC,	\
-				"%s called %s", 			\
-				G_OBJECT_TYPE_NAME (job),		\
-				G_STRFUNC);
+#define BRASERO_JOB_DEBUG(job_MACRO)	brasero_job_log_message (job_MACRO, G_STRLOC,	\
+					"%s called %s", 			\
+					G_OBJECT_TYPE_NAME (job_MACRO),		\
+					G_STRFUNC);
 
 #define BRASERO_JOB_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_JOB, BraseroJobPrivate))