[gnumeric] Fix display of autocomplete suggestions [#610537]



commit 084ac17ebb4a78a69fc5841baac0e4a25144239b
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Feb 24 06:58:42 2010 -0700

    Fix display of autocomplete suggestions [#610537]
    
    2010-02-24 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/item-edit.c (item_edit_update_bounds): remove duplicated code
    	* src/sheet-control-gui.c (scg_reload_item_edits): new
    	* src/sheet-control-gui.h (scg_reload_item_edits): new
    	* src/wbc-gtk-edit.c (workbook_edit_complete_notify): also reload
    	  item edits

 ChangeLog               |    8 ++++++++
 NEWS                    |    1 +
 src/item-edit.c         |    2 --
 src/sheet-control-gui.c |   10 ++++++++++
 src/sheet-control-gui.h |    2 ++
 src/wbc-gtk-edit.c      |    2 ++
 6 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ae3825e..8d9d505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-24 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/item-edit.c (item_edit_update_bounds): remove duplicated code
+	* src/sheet-control-gui.c (scg_reload_item_edits): new
+	* src/sheet-control-gui.h (scg_reload_item_edits): new
+	* src/wbc-gtk-edit.c (workbook_edit_complete_notify): also reload
+	  item edits
+
 2010-02-16  Morten Welinder  <terra gnome org>
 
 	* configure.in: turn off -Wstrict-prototypes for stable builds.
diff --git a/NEWS b/NEWS
index 4e8fb05..e277d99 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
 	* Fix storing of error-literals in ODF. [#610175]
 	* Don't export filter combos to ODF. [#610399]
 	* Apply filter on ODF import. [#610399]
+	* Fix display of autocomplete suggestions [#610537]
 
 Jean:
 	* Fix a crasher in excelplugin: don't call a NULL function. [#610012]
diff --git a/src/item-edit.c b/src/item-edit.c
index baf1c2d..27a12d1 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -325,8 +325,6 @@ item_edit_update_bounds (GocItem *item)
 		pango_layout_set_attributes (ie->layout, attrs);
 		pango_attr_list_unref (attrs);
 
-		text = wbcg_edit_get_display_text (scg_wbcg (ie->scg));
-
 		if (pane->preedit_length) {
 			PangoAttrList *tmp_attrs = pango_attr_list_new ();
 			pango_attr_list_splice (tmp_attrs, pane->preedit_attrs,
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 779ffc6..1df1ff6 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -3734,3 +3734,13 @@ scg_delete_sheet_if_possible (SheetControlGUI *scg)
 		cmd_reorganize_sheets (wbc, old_state, sheet);
 	}
 }
+
+void 
+scg_reload_item_edits (SheetControlGUI *scg)
+{
+	SCG_FOREACH_PANE (scg, pane, {
+			if (pane->editor != NULL)
+				goc_item_bounds_changed 
+					(GOC_ITEM (pane->editor));
+	});
+}
diff --git a/src/sheet-control-gui.h b/src/sheet-control-gui.h
index 96abb69..cd88523 100644
--- a/src/sheet-control-gui.h
+++ b/src/sheet-control-gui.h
@@ -107,6 +107,8 @@ void scg_drag_data_get      (SheetControlGUI *scg,
 
 void scg_delete_sheet_if_possible (SheetControlGUI *scg);
 
+void scg_reload_item_edits (SheetControlGUI *scg);
+
 /* Convenience wrappers.  */
 SheetView	*scg_view	(SheetControlGUI const *scg);
 Sheet		*scg_sheet	(SheetControlGUI const *scg);
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 4caeb20..e6af0d0 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -329,6 +329,8 @@ workbook_edit_complete_notify (char const *text, void *closure)
 
 	g_free (wbcg->auto_complete_text);
 	wbcg->auto_complete_text = g_strdup (text);
+
+	scg_reload_item_edits (wbcg_cur_scg (wbcg));
 }
 
 static void



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