[gnumeric] fixed graph object size issues. [#599887]

[Jean Bréfort <jbrefort src gnome org>]

commit c771e191d4d5d33ea4d82de4eed86202837dbf72
Author: Jean Brefort <jean brefort normalesup org>
Date:   Thu Oct 29 14:06:34 2009 +0100

    fixed graph object size issues. [#599887]

 ChangeLog           |    7 +++++++
 NEWS                |    3 +++
 src/gnm-pane-impl.h |    1 +
 src/gnm-pane.c      |   30 ++++++++++++++++++++----------
 4 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 55e1164..6a8859a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-29  Jean Brefort  <jean brefort normalesup org>
+
+	* src/gnm-pane-impl.h: fixed graph object size issues. [#599887]
+	* src/gnm-pane.c (gnm_pane_object_key_press), (gnm_pane_focus_out),
+	(gnm_pane_display_obj_size_tip), (gnm_pane_object_move),
+	(control_point_enter_notify), (control_point_leave_notify): ditto.
+
 2009-10-28  Morten Welinder  <terra gnome org>
 
 	* src/solver.h (SolverConstraint): Remove redundant str member.
diff --git a/NEWS b/NEWS
index 3afb1a6..d2c3a66 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ Andreas:
 	* Add BINOM.DIST.RANGE (equivalent to the ODF function B).
 	* Make Autofilter addition & removal undoable [#478152]
 
+Jean:
+	* Fixed graph size issues. [#599887]
+
 Jody:
 	* First steps towards a turnkey win32 build.
 
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 3ec5daf..1ffe0f3 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -76,6 +76,7 @@ struct _GnmPane {
 
 	GdkCursor	*mouse_cursor;
 	GtkWidget       *size_tip;
+	SheetObject     *cur_object;
 };
 
 G_END_DECLS
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index ede1de5..425ff67 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -54,6 +54,7 @@ static GocCanvasClass *parent_klass;
 
 static void cb_pane_popup_menu (GnmPane *pane);
 static void gnm_pane_clear_obj_size_tip (GnmPane *pane);
+static void gnm_pane_display_obj_size_tip (GnmPane *pane);
 
 /**
  * For now, application/x-gnumeric is disabled. It handles neither
@@ -142,15 +143,23 @@ gnm_pane_object_key_press (GnmPane *pane, GdkEventKey *ev)
 
 	case GDK_KP_Left: case GDK_Left:
 		scg_objects_nudge (scg, pane, (alt ? 4 : (control ? 3 : 8)), -delta , 0, symmetric, shift);
+		if (pane->cur_object)
+			gnm_pane_display_obj_size_tip (pane);
 		return TRUE;
 	case GDK_KP_Right: case GDK_Right:
 		scg_objects_nudge (scg, pane, (alt ? 4 : (control ? 3 : 8)), delta, 0, symmetric, shift);
+		if (pane->cur_object)
+			gnm_pane_display_obj_size_tip (pane);
 		return TRUE;
 	case GDK_KP_Up: case GDK_Up:
 		scg_objects_nudge (scg, pane, (alt ? 6 : (control ? 1 : 8)), 0, -delta, symmetric, shift);
+		if (pane->cur_object)
+			gnm_pane_display_obj_size_tip (pane);
 		return TRUE;
 	case GDK_KP_Down: case GDK_Down:
 		scg_objects_nudge (scg, pane, (alt ? 6 : (control ? 1 : 8)), 0, delta, symmetric, shift);
+		if (pane->cur_object)
+			gnm_pane_display_obj_size_tip (pane);
 		return TRUE;
 
 	default:
@@ -644,6 +653,7 @@ gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 static gint
 gnm_pane_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
+	gnm_pane_clear_obj_size_tip (GNM_PANE (widget));
 	gtk_im_context_focus_out (GNM_PANE (widget)->im_context);
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_out_event) (widget, event);
 }
@@ -1884,15 +1894,15 @@ gnm_pane_clear_obj_size_tip (GnmPane *pane)
 }
 
 static void
-gnm_pane_display_obj_size_tip (GnmPane *pane, SheetObject const *so)
+gnm_pane_display_obj_size_tip (GnmPane *pane)
 {
 	SheetControlGUI *scg = pane->simple.scg;
-	double const *coords = g_hash_table_lookup (scg->selected_objects, so);
+	double const *coords = g_hash_table_lookup (scg->selected_objects, pane->cur_object);
 	double pts[4];
 	char *msg;
 	SheetObjectAnchor anchor;
 
-	g_return_if_fail (so != NULL);
+	g_return_if_fail (pane->cur_object != NULL);
 
 	if (pane->size_tip == NULL) {
 		GtkWidget *cw = GTK_WIDGET (pane);
@@ -1912,7 +1922,7 @@ gnm_pane_display_obj_size_tip (GnmPane *pane, SheetObject const *so)
 
 	g_return_if_fail (pane->size_tip != NULL);
 
-	anchor = *sheet_object_get_anchor (so);
+	anchor = *sheet_object_get_anchor (pane->cur_object);
 	scg_object_coords_to_anchor (scg, coords, &anchor);
 	sheet_object_anchor_to_pts (&anchor, scg_sheet (scg), pts);
 	msg = g_strdup_printf (_("%.1f x %.1f pts\n%d x %d pixels"),
@@ -2252,12 +2262,12 @@ gnm_pane_object_move (GnmPane *pane, GObject *ctrl_pt,
 		      gboolean snap_to_grid)
 {
 	int const idx = GPOINTER_TO_INT (g_object_get_data (ctrl_pt, "index"));
-	SheetObject *so  = g_object_get_data (G_OBJECT (ctrl_pt), "so");
+	pane->cur_object  = g_object_get_data (G_OBJECT (ctrl_pt), "so");
 
-	gnm_pane_objects_drag (pane, so, new_x, new_y, idx,
+	gnm_pane_objects_drag (pane, pane->cur_object, new_x, new_y, idx,
 			       symmetric, snap_to_grid);
 	if (idx != 8)
-		gnm_pane_display_obj_size_tip (pane, so);
+		gnm_pane_display_obj_size_tip (pane);
 }
 
 static gboolean
@@ -2686,17 +2696,16 @@ control_point_enter_notify (GocItem *item, G_GNUC_UNUSED double x, G_GNUC_UNUSED
 	GnmPane *pane = GNM_PANE (item->canvas);
 	SheetControlGUI *scg = pane->simple.scg;
 	int idx;
-	SheetObject *so;
 
 	control_point_set_cursor (scg, item);
 
-	so  = g_object_get_data (G_OBJECT (item), "so");
+	pane->cur_object  = g_object_get_data (G_OBJECT (item), "so");
 	idx = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "index"));
 	if (idx != 8) {
 		GOStyle *style = go_styled_object_get_style (GO_STYLED_OBJECT (item));
 		style->fill.pattern.back = GO_COLOR_GREEN;
 		goc_item_invalidate (item);
-		gnm_pane_display_obj_size_tip (pane, so);
+		gnm_pane_display_obj_size_tip (pane);
 	}
 	return TRUE;
 }
@@ -2719,6 +2728,7 @@ control_point_leave_notify (GocItem *item, G_GNUC_UNUSED double x, G_GNUC_UNUSED
 		goc_item_invalidate (item);
 		gnm_pane_clear_obj_size_tip (pane);
 	}
+	pane->cur_object = NULL;
 	return TRUE;
 }