Commit 54c094a2 authored by Jean Bréfort's avatar Jean Bréfort

Fix in-cell editing when zoom < 100%. [#662679]

parent 7583b00b
2010-08-12 Jean Brefort <jean.brefort@normalesup.org>
* src/item-edit.c (item_edit_update_bounds): fix in-cell editing when
zoom < 100%. [#626679]
2010-08-11 Morten Welinder <terra@gnome.org> 2010-08-11 Morten Welinder <terra@gnome.org>
* src/xml-sax-read.c (xml_sax_colrow): Set "pos" initially. * src/xml-sax-read.c (xml_sax_colrow): Set "pos" initially.
......
...@@ -18,6 +18,7 @@ Jean: ...@@ -18,6 +18,7 @@ Jean:
* Fix scroll when selecting a merged cell. [#626065] * Fix scroll when selecting a merged cell. [#626065]
* Fix objects dragging when zoomed. [#626484] * Fix objects dragging when zoomed. [#626484]
* Fix control points behavior when zooming. * Fix control points behavior when zooming.
* Fix in-cell editing when zoom < 100%. [#662679]
Morten: Morten:
* Survive malformed xml files. * Survive malformed xml files.
......
...@@ -435,7 +435,7 @@ item_edit_update_bounds (GocItem *item) ...@@ -435,7 +435,7 @@ item_edit_update_bounds (GocItem *item)
if (ci->visible) if (ci->visible)
col_size += ci->size_pixels; col_size += ci->size_pixels;
} }
tmp = pane->first_offset.x + canvas->allocation.width; tmp = (pane->first_offset.x + canvas->allocation.width) / scale;
item->x1 = item->x0 + (col_size + GNM_COL_MARGIN + GNM_COL_MARGIN + 1) / scale; item->x1 = item->x0 + (col_size + GNM_COL_MARGIN + GNM_COL_MARGIN + 1) / scale;
if (item->x1 >= tmp) { if (item->x1 >= tmp) {
...@@ -460,7 +460,7 @@ item_edit_update_bounds (GocItem *item) ...@@ -460,7 +460,7 @@ item_edit_update_bounds (GocItem *item)
} }
if (col_size < width) if (col_size < width)
col_size = width; col_size = width;
tmp = pane->first_offset.x; tmp = pane->first_offset.x / scale;
item->x0 = item->x1 - (col_size + GNM_COL_MARGIN + GNM_COL_MARGIN + 1) / scale; item->x0 = item->x1 - (col_size + GNM_COL_MARGIN + GNM_COL_MARGIN + 1) / scale;
if (item->x0 <= tmp) { if (item->x0 <= tmp) {
item->x0 = tmp; item->x0 = tmp;
......
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