[gtk+/rendering-cleanup-next: 85/153] handlebox: Simplify painting code

[Benjamin Otte <otte src gnome org>]

commit d14055ab93010563710b56186aaa1db978398523
Author: Benjamin Otte <otte redhat com>
Date:   Wed Sep 8 14:40:22 2010 +0200

    handlebox: Simplify painting code

 gtk/gtkhandlebox.c |   59 +++++++++++++--------------------------------------
 1 files changed, 15 insertions(+), 44 deletions(-)
---
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index c9ca335..b42dcd6 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -149,8 +149,7 @@ static void     gtk_handle_box_remove        (GtkContainer   *container,
                                               GtkWidget      *widget);
 static void     gtk_handle_box_draw_ghost    (GtkHandleBox   *hb);
 static void     gtk_handle_box_paint         (GtkWidget      *widget,
-                                              GdkEventExpose *event,
-                                              GdkRectangle   *area);
+                                              GdkEventExpose *event);
 static gboolean gtk_handle_box_expose        (GtkWidget      *widget,
                                               GdkEventExpose *event);
 static gboolean gtk_handle_box_button_press  (GtkWidget      *widget,
@@ -783,17 +782,6 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
 		      allocation.width / 2);
 }
 
-static void
-draw_textured_frame (GtkWidget *widget, GdkWindow *window, GdkRectangle *rect, GtkShadowType shadow,
-		     GdkRectangle *clip, GtkOrientation orientation)
-{
-   gtk_paint_handle (gtk_widget_get_style (widget), window,
-                     GTK_STATE_NORMAL, shadow,
-		     clip, widget, "handlebox",
-		     rect->x, rect->y, rect->width, rect->height, 
-		     orientation);
-}
-
 void
 gtk_handle_box_set_shadow_type (GtkHandleBox  *handle_box,
 				GtkShadowType  type)
@@ -923,8 +911,7 @@ gtk_handle_box_get_child_detached (GtkHandleBox *handle_box)
 
 static void
 gtk_handle_box_paint (GtkWidget      *widget,
-                      GdkEventExpose *event,
-		      GdkRectangle   *area)
+                      GdkEventExpose *event)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
   GtkHandleBoxPrivate *priv = hb->priv;
@@ -932,7 +919,6 @@ gtk_handle_box_paint (GtkWidget      *widget,
   GtkWidget *child;
   gint width, height;
   GdkRectangle rect;
-  GdkRectangle dest;
   gint handle_position;
   GtkOrientation handle_orientation;
 
@@ -940,28 +926,12 @@ gtk_handle_box_paint (GtkWidget      *widget,
 
   gdk_drawable_get_size (priv->bin_window, &width, &height);
 
-  if (!event)
-    gtk_paint_box (gtk_widget_get_style (widget),
-		   priv->bin_window,
-		   gtk_widget_get_state (widget),
-		   priv->shadow_type,
-		   area, widget, "handlebox_bin",
-		   0, 0, -1, -1);
-  else
-   gtk_paint_box (gtk_widget_get_style (widget),
-		  priv->bin_window,
-		  gtk_widget_get_state (widget),
-		  priv->shadow_type,
-		  &event->area, widget, "handlebox_bin",
-		  0, 0, -1, -1);
-
-/* We currently draw the handle _above_ the relief of the handlebox.
- * it could also be drawn on the same level...
-
-		 priv->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
-		 priv->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
-		 width,
-		 height);*/
+  gtk_paint_box (gtk_widget_get_style (widget),
+                 priv->bin_window,
+                 gtk_widget_get_state (widget),
+                 priv->shadow_type,
+                 &event->area, widget, "handlebox_bin",
+                 0, 0, -1, -1);
 
   switch (handle_position)
     {
@@ -998,11 +968,12 @@ gtk_handle_box_paint (GtkWidget      *widget,
       break;
     }
 
-  if (gdk_rectangle_intersect (event ? &event->area : area, &rect, &dest))
-    draw_textured_frame (widget, priv->bin_window, &rect,
-			 GTK_SHADOW_OUT,
-			 event ? &event->area : area,
-			 handle_orientation);
+  if (gdk_rectangle_intersect (&event->area, &rect, NULL))
+    gtk_paint_handle (gtk_widget_get_style (widget), priv->bin_window,
+                      GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+		      &event->area, widget, "handlebox",
+		      rect.x, rect.y, rect.width, rect.height, 
+		      handle_orientation);
 
   child = gtk_bin_get_child (bin);
   if (child != NULL && gtk_widget_get_visible (child))
@@ -1027,7 +998,7 @@ gtk_handle_box_expose (GtkWidget      *widget,
 	    gtk_handle_box_draw_ghost (hb);
 	}
       else
-	gtk_handle_box_paint (widget, event, NULL);
+	gtk_handle_box_paint (widget, event);
     }
   
   return FALSE;