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

small cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3172 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-12-10 09:59:39 +00:00
parent 8f0d715464
commit ca3c70ec58
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/insets/ChangeLog
View File

@ -1,3 +1,11 @@
2001-12-09 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insettext.C (draw):
(drawFrame): use insetWidth instead of last_width
* insettext.h: remove variable last_width (insetWidth is exactly
the same) and last_height (computed but never used!)
2001-12-10 Allan Rae <rae@lyx.org>
* insettabular.C (localDispatch): cleanup unlockInsetInInset calls
@ -9,7 +17,7 @@
2001-12-05 Juergen Vigna <jug@sad.it>
* insettext.C (insetAllowed): fixed for the case that we directly
ask the insettext from it's LyXText.
ask the insettext from its LyXText.
(paragraph): fixed the crash when assigning the par->next() from
the EmptyParagraphMechanism!
@ -825,7 +833,7 @@
2001-07-18 Juergen Vigna <jug@sad.it>
* insetcollapsable.C (edit): fixed hopefully the y parameter which
is givven to the InsetText.
is given to the InsetText.
(insetButtonPress): ditto
(insetButtonRelease): ditto
(insetMotionNotify): ditto

16
src/insets/insettext.C
View File

@ -179,8 +179,6 @@ void InsetText::init(InsetText const * ins, bool same_id)
autoBreakRows = false;
}
top_y = 0;
last_width = 0;
last_height = 0;
insetAscent = 0;
insetDescent = 0;
insetWidth = 0;
@ -398,9 +396,9 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
x += static_cast<float>(scroll());
// if top_x differs we did it already
if (!cleared && (top_x == int(x)) &&
((need_update&(INIT|FULL)) || (top_baseline!=baseline) ||
(last_drawn_width!=insetWidth))) {
if (!cleared && (top_x == int(x))
&& ((need_update&(INIT|FULL)) || (top_baseline != baseline)
||(last_drawn_width != insetWidth))) {
clearInset(bv, baseline, cleared);
}
@ -417,8 +415,6 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
top_baseline = baseline;
top_y = baseline - ascent(bv, f);
last_width = width(bv, f);
last_height = ascent(bv, f) + descent(bv, f);
if (last_drawn_width != insetWidth) {
if (!cleared)
@ -435,7 +431,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
if (!cleared && (need_update == CURSOR)
&& !getLyXText(bv)->selection.set()) {
drawFrame(pain, cleared);
x += last_width; // was width(bv, f);
x += insetWidth;
need_update = NONE;
return;
}
@ -498,7 +494,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
clearFrame(pain, cleared);
}
x += last_width /* was width(bv, f) */ - TEXT_TO_INSET_OFFSET;
x += insetWidth - TEXT_TO_INSET_OFFSET;
if (bv->text->status() == LyXText::CHANGED_IN_DRAW) {
need_update |= FULL;
@ -517,7 +513,7 @@ void InsetText::drawFrame(Painter & pain, bool cleared) const
if (!frame_is_visible || cleared) {
frame_x = top_x + ttoD2;
frame_y = top_baseline - insetAscent + ttoD2;
frame_w = last_width - TEXT_TO_INSET_OFFSET;
frame_w = insetWidth - TEXT_TO_INSET_OFFSET;
frame_h = insetAscent + insetDescent - TEXT_TO_INSET_OFFSET;
pain.rectangle(frame_x, frame_y,
frame_w, frame_h,

4
src/insets/insettext.h
View File

@ -339,10 +339,6 @@ private:
///
mutable int insetWidth;
///
mutable int last_width;
///
mutable int last_height;
///
mutable int top_y;
///
Paragraph * inset_par;