anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* cleaned up word dimension calculation of completion. There is still a bug with RTL which moves the popup to left when completing.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23151 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-02-23 03:15:05 +00:00
parent 919e9a80eb
commit b7782d1973
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/insets/InsetText.cpp
View File

@ -552,22 +552,28 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s,
void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
Dimension & dim) const Dimension & dim) const
{ {
Cursor const & bvcur = cur.bv().cursor();
// get word in front of cursor // get word in front of cursor
docstring word = previousWord(cur.buffer(), cur.top()); docstring word = previousWord(cur.buffer(), bvcur.top());
DocIterator wordStart = cur; DocIterator wordStart = bvcur;
wordStart.pos() -= word.length(); wordStart.pos() -= word.length();
// get position on screen of the word start // get position on screen of the word start and end
Point lxy = cur.bv().getPos(wordStart, false); Point lxy = cur.bv().getPos(wordStart, false);
x = lxy.x_; Point rxy = cur.bv().getPos(bvcur, bvcur.boundary());
y = lxy.y_;
// calculate dimensions of the word
// Calculate dimensions of the word
TextMetrics const & tm = cur.bv().textMetrics(&text_); TextMetrics const & tm = cur.bv().textMetrics(&text_);
dim = tm.rowHeight(cur.pit(), wordStart.pos(), cur.pos(), false); dim = tm.rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);
Point rxy = cur.bv().getPos(cur, cur.boundary()); dim.wid = abs(rxy.x_ - lxy.x_);
dim.wid = abs(rxy.x_ - x);
x = (rxy.x_ < x) ? x - dim.wid : x; // for RTL // calculate position of word
y = lxy.y_;
x = min(rxy.x_, lxy.x_);
//lyxerr << "wid=" << dim.width() << " x=" << x << " y=" << y << " lxy.x_=" << lxy.x_ << " rxy.x_=" << rxy.x_ << " word=" << word << std::endl;
//lyxerr << " wordstart=" << wordStart << " bvcur=" << bvcur << " cur=" << cur << std::endl;
} }