[gimp/gtk3-port: 130/251] app: port GimpSpinScale to GTK+ 3.0



commit fc889ef05c0f1a02e34710eb9ab269479a874c4b
Author: Michael Natterer <mitch gimp org>
Date:   Fri Nov 19 15:23:21 2010 +0100

    app: port GimpSpinScale to GTK+ 3.0

 app/widgets/gimpspinscale.c |  244 ++++++++++++++++++++++++++-----------------
 1 files changed, 148 insertions(+), 96 deletions(-)
---
diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c
index b82d83a..3650024 100644
--- a/app/widgets/gimpspinscale.c
+++ b/app/widgets/gimpspinscale.c
@@ -41,7 +41,8 @@ typedef enum
 {
   TARGET_NUMBER,
   TARGET_UPPER,
-  TARGET_LOWER
+  TARGET_LOWER,
+  TARGET_NONE
 } SpinScaleTarget;
 
 
@@ -74,8 +75,8 @@ static void       gimp_spin_scale_get_property   (GObject        *object,
 
 static void       gimp_spin_scale_style_set      (GtkWidget      *widget,
                                                   GtkStyle       *prev_style);
-static gboolean   gimp_spin_scale_expose         (GtkWidget      *widget,
-                                                  GdkEventExpose *event);
+static gboolean   gimp_spin_scale_draw           (GtkWidget      *widget,
+                                                  cairo_t        *cr);
 static gboolean   gimp_spin_scale_button_press   (GtkWidget      *widget,
                                                   GdkEventButton *event);
 static gboolean   gimp_spin_scale_button_release (GtkWidget      *widget,
@@ -104,7 +105,7 @@ gimp_spin_scale_class_init (GimpSpinScaleClass *klass)
   object_class->get_property         = gimp_spin_scale_get_property;
 
   widget_class->style_set            = gimp_spin_scale_style_set;
-  widget_class->expose_event         = gimp_spin_scale_expose;
+  widget_class->draw                 = gimp_spin_scale_draw;
   widget_class->button_press_event   = gimp_spin_scale_button_press;
   widget_class->button_release_event = gimp_spin_scale_button_release;
   widget_class->motion_notify_event  = gimp_spin_scale_button_motion;
@@ -218,64 +219,32 @@ gimp_spin_scale_style_set (GtkWidget *widget,
 }
 
 static gboolean
-gimp_spin_scale_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
+gimp_spin_scale_draw (GtkWidget *widget,
+                      cairo_t   *cr)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
   GtkStyle             *style   = gtk_widget_get_style (widget);
-  cairo_t              *cr;
-  gint                  w, h;
+  GtkAllocation         allocation;
 
-  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+  cairo_save (cr);
+  GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
+  cairo_restore (cr);
 
-  cr = gdk_cairo_create (event->window);
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-
-#if GTK_CHECK_VERSION (2, 24, 0)
-  w = gdk_window_get_width (event->window);
-  h = gdk_window_get_height (event->window);
-#else
-  gdk_drawable_get_size (event->window, &w, &h);
-#endif
+  gtk_widget_get_allocation (widget, &allocation);
 
   cairo_set_line_width (cr, 1.0);
 
-  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
-    {
-      /* let right line of rectangle disappear */
-      cairo_rectangle (cr, 0.5, 0.5, w, h - 1.0);
-      gdk_cairo_set_source_color (cr,
-                                  &style->text[gtk_widget_get_state (widget)]);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      /* let left line of rectangle disappear */
-      cairo_rectangle (cr, -0.5, 0.5, w, h - 1.0);
-      gdk_cairo_set_source_color (cr,
-                                  &style->text[gtk_widget_get_state (widget)]);
-      cairo_stroke (cr);
-
-      cairo_rectangle (cr, 0.5, 1.5, w - 2.0, h - 3.0);
-      gdk_cairo_set_source_color (cr,
-                                  &style->base[gtk_widget_get_state (widget)]);
-      cairo_stroke (cr);
-    }
-
-  cairo_destroy (cr);
+  cairo_rectangle (cr, 0.5, 0.5,
+                   allocation.width - 1.0, allocation.height - 1.0);
+  gdk_cairo_set_source_color (cr,
+                              &style->text[gtk_widget_get_state (widget)]);
+  cairo_stroke (cr);
 
-  if (private->label &&
-      gtk_widget_is_drawable (widget) &&
-      event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+  if (private->label)
     {
       PangoLayout     *layout;
       const GtkBorder *border;
 
-      cr = gdk_cairo_create (event->window);
-      gdk_cairo_region (cr, event->region);
-      cairo_clip (cr);
-
       border = gtk_entry_get_inner_border (GTK_ENTRY (widget));
 
       if (border)
@@ -288,7 +257,6 @@ gimp_spin_scale_expose (GtkWidget      *widget,
 
       layout = gtk_widget_create_pango_layout (widget, private->label);
       pango_cairo_show_layout (cr, layout);
-      cairo_destroy (cr);
 
       g_object_unref (layout);
     }
@@ -296,28 +264,100 @@ gimp_spin_scale_expose (GtkWidget      *widget,
   return FALSE;
 }
 
+/* Returns TRUE if a translation should be done */
+static gboolean
+gtk_widget_get_translation_to_window (GtkWidget *widget,
+                                      GdkWindow *window,
+                                      int       *x,
+                                      int       *y)
+{
+  GdkWindow *w, *widget_window;
+
+  if (!gtk_widget_get_has_window (widget))
+    {
+      GtkAllocation allocation;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      *x = -allocation.x;
+      *y = -allocation.y;
+    }
+  else
+    {
+      *x = 0;
+      *y = 0;
+    }
+
+  widget_window = gtk_widget_get_window (widget);
+
+  for (w = window; w && w != widget_window; w = gdk_window_get_parent (w))
+    {
+      int wx, wy;
+      gdk_window_get_position (w, &wx, &wy);
+      *x += wx;
+      *y += wy;
+    }
+
+  if (w == NULL)
+    {
+      *x = 0;
+      *y = 0;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_spin_scale_event_to_widget_coords (GtkWidget *widget,
+                                        GdkWindow *window,
+                                        gdouble    event_x,
+                                        gdouble    event_y,
+                                        gint      *widget_x,
+                                        gint      *widget_y)
+{
+  gint tx, ty;
+
+  if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty))
+    {
+      event_x += tx;
+      event_y += ty;
+    }
+
+  *widget_x = event_x;
+  *widget_y = event_y;
+}
+
 static SpinScaleTarget
 gimp_spin_scale_get_target (GtkWidget *widget,
                             gdouble    x,
                             gdouble    y)
 {
-  GtkAllocation allocation;
-  gint          layout_x;
-  gint          layout_y;
+  GdkRectangle text_area;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  gtk_entry_get_layout_offsets (GTK_ENTRY (widget), &layout_x, &layout_y);
+  gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
 
-  if (x > layout_x && y > layout_y)
+  if (x >= text_area.x && x < text_area.width &&
+      y >= text_area.y && y < text_area.height)
     {
-      return TARGET_NUMBER;
-    }
-  else if (y > allocation.height / 2)
-    {
-      return TARGET_LOWER;
+      gint layout_x;
+      gint layout_y;
+
+      gtk_entry_get_layout_offsets (GTK_ENTRY (widget), &layout_x, &layout_y);
+
+      if (x > layout_x && y > layout_y)
+        {
+          return TARGET_NUMBER;
+        }
+      else if (y > text_area.height / 2)
+        {
+          return TARGET_LOWER;
+        }
+
+      return TARGET_UPPER;
     }
 
-  return TARGET_UPPER;
+  return TARGET_NONE;
 }
 
 static void
@@ -327,15 +367,10 @@ gimp_spin_scale_change_value (GtkWidget *widget,
   GimpSpinScalePrivate *private     = GET_PRIVATE (widget);
   GtkSpinButton        *spin_button = GTK_SPIN_BUTTON (widget);
   GtkAdjustment        *adjustment  = gtk_spin_button_get_adjustment (spin_button);
-  GdkWindow            *text_window = gtk_entry_get_text_window (GTK_ENTRY (widget));
-  gint                  width;
+  GdkRectangle          text_area;
   gdouble               value;
 
-#if GTK_CHECK_VERSION (2, 24, 0)
-  width = gdk_window_get_width (text_window);
-#else
-  gdk_drawable_get_size (text_window, &width, NULL);
-#endif
+  gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
 
   if (private->relative_change)
     {
@@ -344,7 +379,7 @@ gimp_spin_scale_change_value (GtkWidget *widget,
 
       step = ((gtk_adjustment_get_upper (adjustment) -
                gtk_adjustment_get_lower (adjustment)) +
-              gtk_adjustment_get_lower (adjustment)) / width / 10.0;
+              gtk_adjustment_get_lower (adjustment)) / text_area.width / 10.0;
 
       diff = x - private->start_x;
 
@@ -354,7 +389,7 @@ gimp_spin_scale_change_value (GtkWidget *widget,
     {
       gdouble fraction;
 
-      fraction = x / (gdouble) width;
+      fraction = x / (gdouble) text_area.width;
 
       value = (fraction * (gtk_adjustment_get_upper (adjustment) -
                            gtk_adjustment_get_lower (adjustment)) +
@@ -369,37 +404,39 @@ gimp_spin_scale_button_press (GtkWidget      *widget,
                               GdkEventButton *event)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  gint                  x, y;
 
   private->changing_value  = FALSE;
   private->relative_change = FALSE;
 
-  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+  gimp_spin_scale_event_to_widget_coords (widget, event->window,
+                                          event->x, event->y,
+                                          &x, &y);
+
+  switch (gimp_spin_scale_get_target (widget, x, y))
     {
-      switch (gimp_spin_scale_get_target (widget, event->x, event->y))
-        {
-        case TARGET_UPPER:
-          private->changing_value = TRUE;
+    case TARGET_UPPER:
+      private->changing_value = TRUE;
 
-          gtk_widget_grab_focus (widget);
+      gtk_widget_grab_focus (widget);
 
-          gimp_spin_scale_change_value (widget, event->x);
+      gimp_spin_scale_change_value (widget, x);
 
-          return TRUE;
+      return TRUE;
 
-        case TARGET_LOWER:
-          private->changing_value = TRUE;
+    case TARGET_LOWER:
+      private->changing_value = TRUE;
 
-          gtk_widget_grab_focus (widget);
+      gtk_widget_grab_focus (widget);
 
-          private->relative_change = TRUE;
-          private->start_x = event->x;
-          private->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
+      private->relative_change = TRUE;
+      private->start_x = x;
+      private->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
 
-          return TRUE;
+      return TRUE;
 
-        default:
-          break;
-        }
+    default:
+      break;
     }
 
   return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
@@ -410,12 +447,17 @@ gimp_spin_scale_button_release (GtkWidget      *widget,
                                 GdkEventButton *event)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  gint                  x, y;
+
+  gimp_spin_scale_event_to_widget_coords (widget, event->window,
+                                          event->x, event->y,
+                                          &x, &y);
 
   if (private->changing_value)
     {
       private->changing_value = FALSE;
 
-      gimp_spin_scale_change_value (widget, event->x);
+      gimp_spin_scale_change_value (widget, x);
 
       return TRUE;
     }
@@ -428,10 +470,15 @@ gimp_spin_scale_button_motion (GtkWidget      *widget,
                                GdkEventMotion *event)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  gint                  x, y;
+
+  gimp_spin_scale_event_to_widget_coords (widget, event->window,
+                                          event->x, event->y,
+                                          &x, &y);
 
   if (private->changing_value)
     {
-      gimp_spin_scale_change_value (widget, event->x);
+      gimp_spin_scale_change_value (widget, x);
 
       return TRUE;
     }
@@ -439,13 +486,12 @@ gimp_spin_scale_button_motion (GtkWidget      *widget,
   GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event);
 
   if (! (event->state &
-         (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) &&
-      event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+         (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
     {
       GdkDisplay *display = gtk_widget_get_display (widget);
       GdkCursor  *cursor  = NULL;
 
-      switch (gimp_spin_scale_get_target (widget, event->x, event->y))
+      switch (gimp_spin_scale_get_target (widget, x, y))
         {
         case TARGET_NUMBER:
           cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
@@ -458,10 +504,16 @@ gimp_spin_scale_button_motion (GtkWidget      *widget,
         case TARGET_LOWER:
           cursor = gdk_cursor_new_for_display (display, GDK_SB_H_DOUBLE_ARROW);
           break;
+
+        default:
+          break;
         }
 
-      gdk_window_set_cursor (event->window, cursor);
-      gdk_cursor_unref (cursor);
+      if (cursor)
+        {
+          gdk_window_set_cursor (event->window, cursor);
+          g_object_unref (cursor);
+        }
     }
 
   return FALSE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]