more fix movement

This commit is contained in:
Ilia Maslakov 2009-05-08 14:00:38 +00:00
parent 2ab90e3191
commit 8448847458
3 changed files with 8 additions and 5 deletions

View File

@ -355,7 +355,7 @@ int book_mark_get_collapse_state (GList * list, const int line,
int c = 0;
c = book_mark_collapse_query (list, line, &start_line, &end_line, &state);
mc_log("l: %i, start_line:%i, end_line:%i", line, start_line, end_line);
// mc_log("l: %i, start_line:%i, end_line:%i", line, start_line, end_line);
if ( c == 0 )
return C_LINES_DEFAULT;

View File

@ -2615,9 +2615,12 @@ edit_execute_cmd (WEdit *edit, int command, int char_for_insertion)
case CK_Down:
case CK_Down_Highlight:
if ( option_line_status ) {
int skip_rows = book_mark_get_shiftup (edit->collapsed, edit->curs_line + 1);
edit_move_down (edit, skip_rows, 0);
edit->curs_line -= skip_rows;
int collapse_state = book_mark_get_collapse_state (edit->collapsed, edit->curs_line + 1, NULL);
mc_log("l: %i, state : %i\n", edit->curs_line + 1, collapse_state);
if ( collapse_state == C_LINES_COLLAPSED ) {
int skip_rows = book_mark_get_shiftup (edit->collapsed, edit->curs_line + 2);
edit_move_down (edit, skip_rows, 0);
}
}
edit_move_down (edit, 1, 0);
break;

View File

@ -365,7 +365,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
if ( collapse_state == C_LINES_MIDDLE_C )
return;
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);
// mc_log("line: %i, skip: %i state: %i\n", cur_line, skip_rows, collapse_state);
if ( cur_line <= edit->total_lines ) {
g_snprintf (line_stat, LINE_STATUS_WIDTH + 1, "%7ld ", cur_line + 1);
} else {