I/O for indent.

2001-02-20 Jody Goldberg <jgoldberg@home.com> * src/xml-io.c (xml_write_style) : store indent. (xml_read_style) : restore indent.

I/O for indent.
2001-02-20 Jody Goldberg <jgoldberg@home.com> * src/xml-io.c (xml_write_style) : store indent. (xml_read_style) : restore indent.
5a5c1c75 · Jody Goldberg · Jody Goldberg · b60fb1ee · 5a5c1c75 · 5a5c1c75
Commit 5a5c1c75 authored Feb 20, 2001 by Jody Goldberg Committed by Jody Goldberg Feb 20, 2001
12 changed files
--- a/ChangeLog
+++ b/ChangeLog
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/xml-io.c (xml_write_style) : store indent.
+	(xml_read_style) : restore indent.
+
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/item-edit.c (item_edit_draw_text) : draw autocompletions of
+	  wrapped text nicely.
+
 2001-01-20  John Gotts  <jgotts@linuxsavvy.com>

 	* gnumeric.spec.in: Sync with new directory structure.

--- a/OChangeLog-2001-06-26
+++ b/OChangeLog-2001-06-26
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/xml-io.c (xml_write_style) : store indent.
+	(xml_read_style) : restore indent.
+
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/item-edit.c (item_edit_draw_text) : draw autocompletions of
+	  wrapped text nicely.
+
 2001-01-20  John Gotts  <jgotts@linuxsavvy.com>

 	* gnumeric.spec.in: Sync with new directory structure.

--- a/OChangeLog-2002-01-22
+++ b/OChangeLog-2002-01-22
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/xml-io.c (xml_write_style) : store indent.
+	(xml_read_style) : restore indent.
+
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/item-edit.c (item_edit_draw_text) : draw autocompletions of
+	  wrapped text nicely.
+
 2001-01-20  John Gotts  <jgotts@linuxsavvy.com>

 	* gnumeric.spec.in: Sync with new directory structure.

--- a/OChangeLog-2003-12-23
+++ b/OChangeLog-2003-12-23
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/xml-io.c (xml_write_style) : store indent.
+	(xml_read_style) : restore indent.
+
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/item-edit.c (item_edit_draw_text) : draw autocompletions of
+	  wrapped text nicely.
+
 2001-01-20  John Gotts  <jgotts@linuxsavvy.com>

 	* gnumeric.spec.in: Sync with new directory structure.

--- a/OChangeLog-2005-11-14
+++ b/OChangeLog-2005-11-14
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/xml-io.c (xml_write_style) : store indent.
+	(xml_read_style) : restore indent.
+
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/item-edit.c (item_edit_draw_text) : draw autocompletions of
+	  wrapped text nicely.
+
 2001-01-20  John Gotts  <jgotts@linuxsavvy.com>

 	* gnumeric.spec.in: Sync with new directory structure.

--- a/plugins/xml2/ChangeLog
+++ b/plugins/xml2/ChangeLog
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* xml2.c (xml2ParseStyleRegionStyle) : restore indent.
+
 2001-02-19  Jon K Hellan  <hellan@acm.org>

 	* xml2.c (xml2_open): Change file format level to

--- a/plugins/xml2/xml2.c
+++ b/plugins/xml2/xml2.c
@@ -730,6 +730,8 @@ xml2ParseStyleRegionStyle (XML2ParseState *state, CHAR const **attrs)
 			mstyle_set_orientation (state->style, val);
 		else if (xml2ParseAttrInt (attrs, "Shade", &val))
 			mstyle_set_pattern (state->style, val);
+		else if (xml2ParseAttrInt (attrs, "Indent", &val))
+			mstyle_set_indent (state->style, val);
 		else if (xml2ParseAttrColour (attrs, "Fore", &colour))
 			mstyle_set_color (state->style, MSTYLE_COLOR_FORE, colour);
 		else if (xml2ParseAttrColour (attrs, "Back", &colour))

--- a/plugins/xml_sax/ChangeLog
+++ b/plugins/xml_sax/ChangeLog
+2001-02-20  Jody Goldberg <jgoldberg@home.com>
+
+	* xml2.c (xml2ParseStyleRegionStyle) : restore indent.
+
 2001-02-19  Jon K Hellan  <hellan@acm.org>

 	* xml2.c (xml2_open): Change file format level to

--- a/plugins/xml_sax/xml-sax-read.c
+++ b/plugins/xml_sax/xml-sax-read.c
@@ -730,6 +730,8 @@ xml2ParseStyleRegionStyle (XML2ParseState *state, CHAR const **attrs)
 			mstyle_set_orientation (state->style, val);
 		else if (xml2ParseAttrInt (attrs, "Shade", &val))
 			mstyle_set_pattern (state->style, val);
+		else if (xml2ParseAttrInt (attrs, "Indent", &val))
+			mstyle_set_indent (state->style, val);
 		else if (xml2ParseAttrColour (attrs, "Fore", &colour))
 			mstyle_set_color (state->style, MSTYLE_COLOR_FORE, colour);
 		else if (xml2ParseAttrColour (attrs, "Back", &colour))

--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -171,8 +171,8 @@ item_edit_draw_cursor (ItemEdit *item_edit, GdkDrawable *drawable, GtkStyle *sty

 static void
 item_edit_draw_text (ItemEdit *item_edit, GdkDrawable *drawable, GtkStyle *style,
-		     gint x, gint y, char const *text, int text_length,
-		     int cursor_pos)
+		     int x1, int y, int w,
+		     char const *text, int text_length, int cursor_pos)
 {
 	GdkFont *font = item_edit->font;

@@ -181,28 +181,28 @@ item_edit_draw_text (ItemEdit *item_edit, GdkDrawable *drawable, GtkStyle *style
 	/* If this segment contains the cursor draw it */
 	if (0 <= cursor_pos && cursor_pos <= text_length) {
 		if (cursor_pos > 0) {
-			gdk_draw_text (drawable, font, gc, x, y, text, cursor_pos);
-			x += gdk_text_width (font, text, cursor_pos);
+			gdk_draw_text (drawable, font, gc, x1, y, text, cursor_pos);
+			x1 += gdk_text_width (font, text, cursor_pos);
 			text += cursor_pos;
 			text_length -= cursor_pos;
 			cursor_pos = 0;
 		}

-		item_edit_draw_cursor (item_edit, drawable, style, x, y, font);
+		item_edit_draw_cursor (item_edit, drawable, style, x1, y, font);
 	}

-	if (text_length > 0){
+	if (text_length > 0) {
 		if (text_length > cursor_pos &&
-		    workbook_auto_completing (item_edit->scg->wbcg)){
-			gdk_draw_rectangle (
-				drawable, style->black_gc, TRUE,
-				x, y - font->ascent,
-				gdk_text_width (font, text, text_length),
-				font->ascent + font->descent);
+		    workbook_auto_completing (item_edit->scg->wbcg)) {
+			if (w < 0)
+				w = gdk_text_width (font, text, text_length);
+			gdk_draw_rectangle (drawable, style->black_gc, TRUE,
+					    x1, y - font->ascent, w,
+					    font->ascent + font->descent);
 			gc = style->white_gc;
 		}

-		gdk_draw_text (drawable, font, gc, x, y, text, text_length);
+		gdk_draw_text (drawable, font, gc, x1, y, text, text_length);
 	}
 }

@@ -212,8 +212,8 @@ item_edit_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 {
 	GtkWidget *canvas   = GTK_WIDGET (item->canvas);
 	ItemEdit *item_edit = ITEM_EDIT (item);
-	ColRowInfo const * const ci = sheet_col_get_info (item_edit->scg->sheet,
-							  item_edit->pos.col);
+	ColRowInfo const *ci = sheet_col_get_info (item_edit->scg->sheet,
+						   item_edit->pos.col);
 	int const left_pos = ((int)item->x1) + ci->margin_a - x;

 	/* NOTE : This does not handle vertical alignment yet so there may be some
@@ -244,17 +244,20 @@ item_edit_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		int const text_end = GPOINTER_TO_INT (ptr->data);

 		item_edit_draw_text (item_edit, drawable, canvas->style,
-				     left_pos, top_pos, text+text_offset, text_end-text_offset,
-				     cursor_pos-text_offset);
+				     left_pos, top_pos, width,
+				     text + text_offset,
+				     text_end - text_offset,
+				     cursor_pos - text_offset);
 		text_offset = text_end;
 		top_pos += item_edit->font_height;
 	}

 	/* draw the remainder */
 	item_edit_draw_text (item_edit, drawable, canvas->style,
-			     left_pos, top_pos, text+text_offset,
-			     strlen (text+text_offset),
-			     cursor_pos-text_offset);
+			     left_pos, top_pos, -1,
+			     text + text_offset,
+			     strlen (text + text_offset),
+			     cursor_pos - text_offset);
 }

 static double

--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -740,6 +740,8 @@ xml_write_style (XmlParseContext *ctxt,
 		xml_set_value_int (cur, "Orient", mstyle_get_orientation (style));
 	if (mstyle_is_element_set (style, MSTYLE_PATTERN))
 		xml_set_value_int (cur, "Shade", mstyle_get_pattern (style));
+	if (mstyle_is_element_set (style, MSTYLE_INDENT))
+		xml_set_value_int (cur, "Indent", mstyle_get_indent (style));

 	if (mstyle_is_element_set (style, MSTYLE_COLOR_FORE)) {
 /*		if (!style_is_default_fore (mstyle_get_color (style, MSTYLE_COLOR_FORE)))*/
@@ -1509,6 +1511,9 @@ xml_read_style (XmlParseContext *ctxt, xmlNodePtr tree)
 	if (xml_get_value_int (tree, "Shade", &val))
 		mstyle_set_pattern (mstyle, val);

+	if (xml_get_value_int (tree, "Indent", &val))
+		mstyle_set_indent (mstyle, val);
+
 	if (xml_get_color_value (tree, "Fore", &c))
 		mstyle_set_color (mstyle, MSTYLE_COLOR_FORE, c);


--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -730,6 +730,8 @@ xml2ParseStyleRegionStyle (XML2ParseState *state, CHAR const **attrs)
 			mstyle_set_orientation (state->style, val);
 		else if (xml2ParseAttrInt (attrs, "Shade", &val))
 			mstyle_set_pattern (state->style, val);
+		else if (xml2ParseAttrInt (attrs, "Indent", &val))
+			mstyle_set_indent (state->style, val);
 		else if (xml2ParseAttrColour (attrs, "Fore", &colour))
 			mstyle_set_color (state->style, MSTYLE_COLOR_FORE, colour);
 		else if (xml2ParseAttrColour (attrs, "Back", &colour))