Commit 46bc8ec7 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

When recalulating all spans, we may need to render some cells too.


2000-05-27  Jody Goldberg <jgoldberg@home.com>

	* src/sheet.c (sheet_update) : When recalulating all spans, we may
	  need to render some cells too.
	(sheet_move_range) : Do not call sheet_update here.
	(sheet_shift_rows) : Call it here.
	(sheet_shift_cols) : and here.

	* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
	(cmd_paste_cut_redo) : No need to force a status range update, move
	  already did that.

	* src/cmd-edit.c (cmd_paste) : typo.
parent f88cadec
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_update) : When recalulating all spans, we may
need to render some cells too.
(sheet_move_range) : Do not call sheet_update here.
(sheet_shift_rows) : Call it here.
(sheet_shift_cols) : and here.
* src/commands.c (cmd_paste_cut_undo) : Do a recalc.
(cmd_paste_cut_redo) : No need to force a status range update, move
already did that.
* src/cmd-edit.c (cmd_paste) : typo.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
......
......@@ -299,7 +299,7 @@ cmd_paste (CommandContext *context, PasteTarget const *pt, guint32 time)
/* Validate the size & shape of the target here. */
int const cols = (src_range->end.col - src_range->start.col);
int const rows = (src_range->end.row - src_range->start.col);
int const rows = (src_range->end.row - src_range->start.row);
Range dst = pt->range;
......
......@@ -535,9 +535,6 @@ cmd_area_set_text_redo (GnumericCommand *cmd, CommandContext *context)
sheet_range_set_text (&me->pos, r, me->text);
}
sheet_set_dirty (me->pos.sheet, TRUE);
workbook_recalc (me->pos.sheet->workbook);
/*
* Now that things have been filled in and recalculated we can generate
* the spans. Non expression cells need to be rendered.
......@@ -550,6 +547,8 @@ cmd_area_set_text_redo (GnumericCommand *cmd, CommandContext *context)
sheet_range_calc_spans (me->pos.sheet, *r, SPANCALC_RENDER);
}
sheet_set_dirty (me->pos.sheet, TRUE);
workbook_recalc (me->pos.sheet->workbook);
sheet_update (me->pos.sheet);
return FALSE;
......@@ -1724,6 +1723,7 @@ cmd_paste_cut_undo (GnumericCommand *cmd, CommandContext *context)
sheet_flag_status_update_range (me->info.target_sheet, NULL /* force update */);
sheet_set_dirty (me->info.target_sheet, TRUE);
workbook_recalc (me->info.target_sheet->workbook);
sheet_update (me->info.target_sheet);
return FALSE;
......@@ -1750,12 +1750,10 @@ cmd_paste_cut_redo (GnumericCommand *cmd, CommandContext *context)
tmp.start.col, tmp.start.row,
tmp.end.col, tmp.end.row);
sheet_set_dirty (me->info.target_sheet, TRUE);
sheet_move_range (context, &me->info);
/* Force update of the status area */
sheet_flag_status_update_range (me->info.target_sheet, NULL /* force update */);
sheet_set_dirty (me->info.target_sheet, TRUE);
workbook_recalc (me->info.target_sheet->workbook);
sheet_update (me->info.target_sheet);
return FALSE;
......
......@@ -710,7 +710,7 @@ sheet_update (Sheet const *sheet)
if (p->recompute_spans) {
p->recompute_spans = FALSE;
sheet_calc_spans (sheet, SPANCALC_RESIZE |
sheet_calc_spans (sheet, SPANCALC_RESIZE|SPANCALC_RENDER |
(p->recompute_visibility ?
SPANCALC_NO_DRAW : SPANCALC_SIMPLE));
}
......@@ -3222,9 +3222,6 @@ sheet_move_range (CommandContext *context,
/* 8. Notify sheet of pending update */
rinfo->origin_sheet->priv->recompute_spans = TRUE;
sheet_flag_status_update_range (rinfo->origin_sheet, &rinfo->origin);
/* FIXME FIXME FIXME : these should be at the command level */
sheet_update (rinfo->origin_sheet);
}
/**
......@@ -3255,6 +3252,9 @@ sheet_shift_rows (CommandContext *context, Sheet *sheet,
rinfo.row_offset = 0;
sheet_move_range (context, &rinfo);
/* FIXME FIXME FIXME : these should be at the command level */
sheet_update (rinfo.origin_sheet);
}
/**
......@@ -3284,6 +3284,9 @@ sheet_shift_cols (CommandContext *context, Sheet *sheet,
rinfo.row_offset = count;
sheet_move_range (context, &rinfo);
/* FIXME FIXME FIXME : these should be at the command level */
sheet_update (rinfo.origin_sheet);
}
double *
......
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