[gimp] app: move stuff to the local scope it belongs to
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move stuff to the local scope it belongs to
- Date: Wed, 24 Feb 2010 00:37:23 +0000 (UTC)
commit 650d635dfbd4cda0ac031c703784f1ace00725f1
Author: Michael Natterer <mitch gimp org>
Date: Wed Feb 24 01:35:40 2010 +0100
app: move stuff to the local scope it belongs to
app/widgets/gimpoverlaychild.c | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/app/widgets/gimpoverlaychild.c b/app/widgets/gimpoverlaychild.c
index bd0bd90..fafaba4 100644
--- a/app/widgets/gimpoverlaychild.c
+++ b/app/widgets/gimpoverlaychild.c
@@ -211,12 +211,8 @@ gimp_overlay_child_size_allocate (GimpOverlayBox *box,
{
GtkWidget *widget;
GtkAllocation allocation;
- gint border;
GtkRequisition child_requisition;
GtkAllocation child_allocation;
- GdkRectangle bounds;
- gint available_width;
- gint available_height;
gint x;
gint y;
@@ -267,13 +263,6 @@ gimp_overlay_child_size_allocate (GimpOverlayBox *box,
/* local transform */
cairo_matrix_rotate (&child->matrix, child->angle);
- gimp_overlay_child_transform_bounds (child, &child_allocation, &bounds);
-
- border = gtk_container_get_border_width (GTK_CONTAINER (box));
-
- available_width = allocation.width - 2 * border;
- available_height = allocation.height - 2 * border;
-
if (child->has_position)
{
x = child->x;
@@ -281,6 +270,18 @@ gimp_overlay_child_size_allocate (GimpOverlayBox *box,
}
else
{
+ GdkRectangle bounds;
+ gint border;
+ gint available_width;
+ gint available_height;
+
+ gimp_overlay_child_transform_bounds (child, &child_allocation, &bounds);
+
+ border = gtk_container_get_border_width (GTK_CONTAINER (box));
+
+ available_width = allocation.width - 2 * border;
+ available_height = allocation.height - 2 * border;
+
x = border;
y = border;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]