gimp r26160 - in trunk: . app/core app/display app/widgets

[martinn svn gnome org]

Author: martinn
Date: Sat Jul 12 13:53:31 2008
New Revision: 26160
URL: http://svn.gnome.org/viewvc/gimp?rev=26160&view=rev

Log:
2008-07-12  Martin Nordholts  <martinn svn gnome org>

	* app/core/gimpmarshal.list: Added
	VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE marshaller.

	* app/widgets/gimpnavigationview.c: Make the "marker-changed"
	signal also pass the marker width and height as parameters.

	* app/display/gimpnavigationeditor.c: Updated accordingly.


Modified:
   trunk/ChangeLog
   trunk/app/core/gimpmarshal.list
   trunk/app/display/gimpnavigationeditor.c
   trunk/app/widgets/gimpnavigationview.c

Modified: trunk/app/core/gimpmarshal.list
==============================================================================
--- trunk/app/core/gimpmarshal.list	(original)
+++ trunk/app/core/gimpmarshal.list	Sat Jul 12 13:53:31 2008
@@ -34,6 +34,7 @@
 VOID: BOXED, ENUM
 VOID: DOUBLE
 VOID: DOUBLE, DOUBLE
+VOID: DOUBLE, DOUBLE, DOUBLE, DOUBLE
 VOID: ENUM
 VOID: ENUM, ENUM, BOXED, INT
 VOID: ENUM, OBJECT

Modified: trunk/app/display/gimpnavigationeditor.c
==============================================================================
--- trunk/app/display/gimpnavigationeditor.c	(original)
+++ trunk/app/display/gimpnavigationeditor.c	Sat Jul 12 13:53:31 2008
@@ -71,6 +71,8 @@
 static void   gimp_navigation_editor_marker_changed    (GimpNavigationView   *view,
                                                         gdouble               x,
                                                         gdouble               y,
+                                                        gdouble               width,
+                                                        gdouble               height,
                                                         GimpNavigationEditor *editor);
 static void   gimp_navigation_editor_zoom              (GimpNavigationView   *view,
                                                         GimpZoomType          direction,
@@ -491,6 +493,8 @@
 gimp_navigation_editor_marker_changed (GimpNavigationView   *view,
                                        gdouble               x,
                                        gdouble               y,
+                                       gdouble               width,
+                                       gdouble               height,
                                        GimpNavigationEditor *editor)
 {
   if (editor->shell)

Modified: trunk/app/widgets/gimpnavigationview.c
==============================================================================
--- trunk/app/widgets/gimpnavigationview.c	(original)
+++ trunk/app/widgets/gimpnavigationview.c	Sat Jul 12 13:53:31 2008
@@ -90,8 +90,10 @@
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GimpNavigationViewClass, marker_changed),
                   NULL, NULL,
-                  gimp_marshal_VOID__DOUBLE_DOUBLE,
-                  G_TYPE_NONE, 2,
+                  gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_DOUBLE,
                   G_TYPE_DOUBLE,
                   G_TYPE_DOUBLE);
 
@@ -239,7 +241,8 @@
   x = tx * ratiox;
   y = ty * ratioy;
 
-  g_signal_emit (view, view_signals[MARKER_CHANGED], 0, x, y);
+  g_signal_emit (view, view_signals[MARKER_CHANGED], 0,
+                 x, y, nav_view->width, nav_view->height);
 }
 
 void