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

Fix bidi bugs 1965, 1970

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10396 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2005-08-15 08:26:53 +00:00
parent 24355f90da
commit a91f7512b2
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2005-08-02 Martin Vermeer <martin.vermeer@hut.fi>
* text.C (cursorX): fix bug 1965: cursor movement at
line end broken in RtL.
(drawSelection): fix bug 1970: drawing of single-line
selection broken for RtL.
2005-07-31 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2005-07-31 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
bug 465. bug 465.

12
src/text.C
View File

@ -1898,12 +1898,13 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
X2 = !isRTL(par2) ? endx : 0 + dim_.wid; X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
} }
if (!above && !below && &par1.getRow(beg.pos(), end.boundary()) if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
== &par2.getRow(end.pos(), end.boundary())) == &par2.getRow(end.pos(), end.boundary()))
{ {
// paint only one rectangle // paint only one rectangle
pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1, int const b( !isRTL(par1) ? x + x1 : x + X1 );
LColor::selection); int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
return; return;
} }
@ -2129,7 +2130,10 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
// see correction above // see correction above
if (boundary_correction) if (boundary_correction)
x += singleWidth(par, ppos); if (getFont(par, ppos).isRightToLeft())
x -= singleWidth(par, ppos);
else
x += singleWidth(par, ppos);
return int(x); return int(x);
} }