Commit 659e088f authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Improve horizontal fill. [#594193, part 1]

2010-06-30  Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* src/cell-draw.c (cell_calc_layout): HALIGN_FILL overrides wrap_text
parent da563f65
2010-06-30 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/cell-draw.c (cell_calc_layout): HALIGN_FILL overrides wrap_text
2010-06-30 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/gnm-format.c (format_value_common): in one-paragraph mode
......
......@@ -4,7 +4,7 @@ Andreas:
* Add new Excel and Openformula units ("pica" and "picapt") to CONVERT.
* Save default search settings. [#105615]
* Improve configurable text export of numbers. [#126444]
* Improve horizontal fill. [#594193, part 2]
* Improve horizontal fill. [#594193, parts 1 and 2]
--------------------------------------------------------------------------
Gnumeric 1.10.7
......
......@@ -111,7 +111,8 @@ cell_calc_layout (GnmCell const *cell, GnmRenderedValue *rv, int y_direction,
if (sin_a < 0) {
hoffset += (width - indent) - rv->layout_natural_width;
}
} else if (!rv->rotation && rv->wrap_text) {
} else if (!rv->rotation && rv->wrap_text
&& (rv->effective_halign != HALIGN_FILL)) {
int wanted_width = MAX (0, width - indent);
if (wanted_width != pango_layout_get_width (layout)) {
pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment