anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a bug in visual cursor movement

Browse Source 
The setting of boundary need to take the paragraph's direction (LTR/RTL) into
account.

This bug was discovered by Vincent, while trying to solve bug #5061.

While this fixes the original manifestation of bug #5061, it doesn't really
solve the underlying issue, which is that on a boundary, after typing
Ctrl-Enter, the cursor is painted on the same line as the newline symbol
rather than on the new line. See bugzilla for further discussion of this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27225 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dov Feldstern 2008-11-01 17:00:58 +00:00
parent 93c9791cb3
commit 13cf13c690
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Cursor.cpp
View File

@ -507,10 +507,11 @@ bool Cursor::posVisRight(bool skip_inset)
new_cur.pos() = right_pos + 1; new_cur.pos() = right_pos + 1;
// set the boundary to true in two situations: // set the boundary to true in two situations:
if ( if (
// 1. if new_pos is now lastpos (which means that we're moving // 1. if new_pos is now lastpos, and we're in an RTL paragraph
// right to the end of an LTR chunk which is at the end of an // (this means that we're moving right to the end of an LTR chunk
// RTL paragraph); // which is at the end of an RTL paragraph);
new_cur.pos() == lastpos() (new_cur.pos() == lastpos()
&& paragraph().isRTL(buffer().params()))
// 2. if the position *after* right_pos is RTL (we want to be // 2. if the position *after* right_pos is RTL (we want to be
// *after* right_pos, not before right_pos + 1!) // *after* right_pos, not before right_pos + 1!)
|| paragraph().getFontSettings(bv().buffer().params(), || paragraph().getFontSettings(bv().buffer().params(),
@ -598,10 +599,11 @@ bool Cursor::posVisLeft(bool skip_inset)
new_cur.pos() = left_pos + 1; new_cur.pos() = left_pos + 1;
// set the boundary to true in two situations: // set the boundary to true in two situations:
if ( if (
// 1. if new_pos is now lastpos (which means that we're moving left // 1. if new_pos is now lastpos and we're in an LTR paragraph
// to the end of an RTL chunk which is at the end of an LTR // (this means that we're moving left to the end of an RTL chunk
// paragraph); // which is at the end of an LTR paragraph);
new_cur.pos() == lastpos() (new_cur.pos() == lastpos()
&& !paragraph().isRTL(buffer().params()))
// 2. if the position *after* left_pos is not RTL (we want to be // 2. if the position *after* left_pos is not RTL (we want to be
// *after* left_pos, not before left_pos + 1!) // *after* left_pos, not before left_pos + 1!)
|| !paragraph().getFontSettings(bv().buffer().params(), || !paragraph().getFontSettings(bv().buffer().params(),