mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix incorrect draw after collapse

This commit is contained in:
Ilia Maslakov 2009-05-08 21:37:42 +00:00
parent 8448847458
commit 7a11911ffa
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
edit/edit.c
View File

@ -2614,15 +2614,21 @@ edit_execute_cmd (WEdit *edit, int command, int char_for_insertion)
break; break;
case CK_Down: case CK_Down:
case CK_Down_Highlight: case CK_Down_Highlight:
edit_move_down (edit, 1, 0);
if ( option_line_status ) { if ( option_line_status ) {
int collapse_state = book_mark_get_collapse_state (edit->collapsed, edit->curs_line + 1, NULL); int collapse_state = book_mark_get_collapse_state (edit->collapsed, edit->curs_line, NULL);
mc_log("l: %i, state : %i\n", edit->curs_line + 1, collapse_state); //mc_log("l: %i, state : %i\n", edit->curs_line, collapse_state);
if ( collapse_state == C_LINES_COLLAPSED ) { if ( collapse_state == C_LINES_COLLAPSED ) {
int skip_rows = book_mark_get_shiftup (edit->collapsed, edit->curs_line + 2); int skip_rows = book_mark_get_shiftup (edit->collapsed, edit->curs_line + 1);
//mc_log("move: %i\n", skip_rows);
edit_move_down (edit, skip_rows, 0); edit_move_down (edit, skip_rows, 0);
//edit->start_display += skip_rows;
//edit->start_line += skip_rows;
//edit->curs_row += skip_rows;
//edit->curs_line += skip_rows;
} }
} }
edit_move_down (edit, 1, 0); edit->force |= REDRAW_PAGE;
break; break;
case CK_Paragraph_Up: case CK_Paragraph_Up:
case CK_Paragraph_Up_Highlight: case CK_Paragraph_Up_Highlight:

19
edit/editdraw.c
View File

@ -365,7 +365,8 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
if ( collapse_state == C_LINES_MIDDLE_C ) if ( collapse_state == C_LINES_MIDDLE_C )
return; return;
skip_rows = book_mark_get_shiftup(edit->collapsed, cur_line); skip_rows = book_mark_get_shiftup(edit->collapsed, cur_line);
// mc_log("line: %i, skip: %i state: %i\n", cur_line, skip_rows, collapse_state); if ( row - skip_rows < 0 )
return;
if ( cur_line <= edit->total_lines ) { if ( cur_line <= edit->total_lines ) {
g_snprintf (line_stat, LINE_STATUS_WIDTH + 1, "%7ld ", cur_line + 1); g_snprintf (line_stat, LINE_STATUS_WIDTH + 1, "%7ld ", cur_line + 1);
} else { } else {
@ -392,7 +393,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
if (col + 16 > -edit->start_col) { if (col + 16 > -edit->start_col) {
eval_marks (edit, &m1, &m2); eval_marks (edit, &m1, &m2);
if (row - skip_rows <= edit->total_lines - edit->start_line) { if (row <= edit->total_lines - edit->start_line) {
long tws = 0; long tws = 0;
if (use_colors && visible_tws) { if (use_colors && visible_tws) {
tws = edit_eol (edit, b); tws = edit_eol (edit, b);
@ -590,15 +591,8 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
int force = edit->force; int force = edit->force;
long b; long b;
int collapse_header = 0;
unsigned int count_collapsed_lines = 0;
unsigned long sline = 0;
unsigned long eline = 0;
int collapse_state = 0;
unsigned long cur_line;
collapsed_lines *cl;
int skip_rows = 0; int skip_rows = 0;
cl = g_new0 (collapsed_lines, 1);
/* /*
* If the position of the page has not moved then we can draw the cursor * If the position of the page has not moved then we can draw the cursor
* character only. This will prevent line flicker when using arrow keys. * character only. This will prevent line flicker when using arrow keys.
@ -607,6 +601,10 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (!(force & REDRAW_IN_BOUNDS)) { /* !REDRAW_IN_BOUNDS means to ignore bounds and redraw whole rows */ if (!(force & REDRAW_IN_BOUNDS)) { /* !REDRAW_IN_BOUNDS means to ignore bounds and redraw whole rows */
start_row = 0; start_row = 0;
end_row = edit->num_widget_lines - 1; end_row = edit->num_widget_lines - 1;
if ( option_line_status ) {
skip_rows = book_mark_get_shiftup (edit->collapsed, edit->curs_line + 1);
end_row += skip_rows;
}
start_column = 0; start_column = 0;
end_column = edit->num_widget_columns - 1; end_column = edit->num_widget_columns - 1;
} }
@ -693,7 +691,6 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
prev_curs = edit->curs1; prev_curs = edit->curs1;
exit_render: exit_render:
g_free(cl);
edit->screen_modified = 0; edit->screen_modified = 0;
return; return;
} }