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

small stuff getLyXText() -> text_, parantheses

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7320 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-07-18 15:43:52 +00:00
parent 4127ff8a32
commit a739b5e45d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/insets/insettext.C
View File

@ -304,7 +304,6 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
// update our idea of where we are. Clearly, we should // update our idea of where we are. Clearly, we should
// not have to know this information. // not have to know this information.
if (top_x != x)
top_x = x; top_x = x;
int const start_x = x; int const start_x = x;
@ -335,7 +334,7 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
} }
if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) { if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
inset_x = cix(bv) - int(x) + drawTextXOffset; inset_x = cix(bv) - x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset; inset_y = ciy() + drawTextYOffset;
} }
@ -348,7 +347,7 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
int ph = pain.paperHeight(); int ph = pain.paperHeight();
int first = 0; int first = 0;
int y = y_offset; int y = y_offset;
while ((rowit != end) && ((y + rowit->height()) <= 0)) { while (rowit != end && y + rowit->height() <= 0) {
y += rowit->height(); y += rowit->height();
first += rowit->height(); first += rowit->height();
++rowit; ++rowit;
@ -377,7 +376,7 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
text_.clearPaint(); text_.clearPaint();
if ((drawFrame_ == ALWAYS) || (drawFrame_ == LOCKED && locked)) { if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
drawFrame(pain, int(start_x)); drawFrame(pain, int(start_x));
} }
@ -1511,8 +1510,7 @@ void InsetText::fitInsetCursor(BufferView * bv) const
the_locking_inset->fitInsetCursor(bv); the_locking_inset->fitInsetCursor(bv);
return; return;
} }
LyXFont const font = LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
getLyXText(bv)->getFont(bv->buffer(), cpar(), cpos());
int const asc = font_metrics::maxAscent(font); int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font); int const desc = font_metrics::maxDescent(font);
@ -1602,7 +1600,7 @@ bool InsetText::insertInset(BufferView * bv, Inset * inset)
return false; return false;
} }
inset->setOwner(this); inset->setOwner(this);
getLyXText(bv)->insertInset(inset); text_.insertInset(inset);
bv->fitCursor(); bv->fitCursor();
updateLocal(bv, CURSOR_PAR|CURSOR, true); updateLocal(bv, CURSOR_PAR|CURSOR, true);
return true; return true;
@ -1676,7 +1674,7 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
if ((paragraphs.size() == 1 && paragraphs.begin()->empty()) if ((paragraphs.size() == 1 && paragraphs.begin()->empty())
|| cpar()->empty()) { || cpar()->empty()) {
getLyXText(bv)->setFont(font, toggleall); text_.setFont(font, toggleall);
return; return;
} }