anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

style

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24303 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2008-04-16 20:43:30 +00:00
parent 8803556805
commit f227ebb021
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/BufferView.cpp
View File

@ -214,7 +214,8 @@ struct BufferView::Private
{ {
Private(BufferView & bv): wh_(0), cursor_(bv), Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0), anchor_pit_(0), anchor_ypos_(0),
last_inset_(0), gui_(0) inlineCompletionUniqueChars(0)
last_inset_(0), gui_(0),
{} {}
/// ///
@ -242,11 +243,11 @@ struct BufferView::Private
vector<int> par_height_; vector<int> par_height_;
/// ///
DocIterator inlineCompletionPos; DocIterator inlineCompletionPos_;
/// ///
docstring inlineCompletion; docstring inlineCompletion_;
/// ///
size_t inlineCompletionUniqueChars; size_t inlineCompletionUniqueChars_;
/// keyboard mapping object. /// keyboard mapping object.
Intl intl_; Intl intl_;
@ -803,8 +804,8 @@ void BufferView::showCursor(DocIterator const & dit)
} }
// fix inline completion position // fix inline completion position
if (d->inlineCompletionPos.fixIfBroken()) if (d->inlineCompletionPos_.fixIfBroken())
d->inlineCompletionPos = DocIterator(); d->inlineCompletionPos_ = DocIterator();
tm.redoParagraph(bot_pit); tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit); ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
@ -1861,8 +1862,8 @@ bool BufferView::singleParUpdate()
int old_height = tm.parMetrics(bottom_pit).height(); int old_height = tm.parMetrics(bottom_pit).height();
// make sure inline completion pointer is ok // make sure inline completion pointer is ok
if (d->inlineCompletionPos.fixIfBroken()) if (d->inlineCompletionPos_.fixIfBroken())
d->inlineCompletionPos = DocIterator(); d->inlineCompletionPos_ = DocIterator();
// In Single Paragraph mode, rebreak only // In Single Paragraph mode, rebreak only
// the (main text, not inset!) paragraph containing the cursor. // the (main text, not inset!) paragraph containing the cursor.
@ -1901,8 +1902,8 @@ void BufferView::updateMetrics()
TextMetrics & tm = textMetrics(&buftext); TextMetrics & tm = textMetrics(&buftext);
// make sure inline completion pointer is ok // make sure inline completion pointer is ok
if (d->inlineCompletionPos.fixIfBroken()) if (d->inlineCompletionPos_.fixIfBroken())
d->inlineCompletionPos = DocIterator(); d->inlineCompletionPos_ = DocIterator();
if (d->anchor_pit_ >= npit) if (d->anchor_pit_ >= npit)
// The anchor pit must have been deleted... // The anchor pit must have been deleted...
@ -2274,19 +2275,19 @@ void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph)
docstring const & BufferView::inlineCompletion() const docstring const & BufferView::inlineCompletion() const
{ {
return d->inlineCompletion; return d->inlineCompletion_;
} }
size_t const & BufferView::inlineCompletionUniqueChars() const size_t const & BufferView::inlineCompletionUniqueChars() const
{ {
return d->inlineCompletionUniqueChars; return d->inlineCompletionUniqueChars_;
} }
DocIterator const & BufferView::inlineCompletionPos() const DocIterator const & BufferView::inlineCompletionPos() const
{ {
return d->inlineCompletionPos; return d->inlineCompletionPos_;
} }
@ -2304,16 +2305,16 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
docstring const & completion, size_t uniqueChars) docstring const & completion, size_t uniqueChars)
{ {
uniqueChars = min(completion.size(), uniqueChars); uniqueChars = min(completion.size(), uniqueChars);
bool changed = d->inlineCompletion != completion bool changed = d->inlineCompletion_ != completion
|| d->inlineCompletionUniqueChars != uniqueChars; || d->inlineCompletionUniqueChars_ != uniqueChars;
bool singlePar = true; bool singlePar = true;
d->inlineCompletion = completion; d->inlineCompletion_ = completion;
d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars); d->inlineCompletionUniqueChars_ = min(completion.size(), uniqueChars);
//lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl; //lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl;
// at new position? // at new position?
DocIterator const & old = d->inlineCompletionPos; DocIterator const & old = d->inlineCompletionPos_;
if (old != pos) { if (old != pos) {
//lyxerr << "inlineCompletionPos changed" << std::endl; //lyxerr << "inlineCompletionPos changed" << std::endl;
// old or pos are in another paragraph? // old or pos are in another paragraph?
@ -2322,7 +2323,7 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
singlePar = false; singlePar = false;
//lyxerr << "different paragraph" << std::endl; //lyxerr << "different paragraph" << std::endl;
} }
d->inlineCompletionPos = pos; d->inlineCompletionPos_ = pos;
} }
// set update flags // set update flags