2002-04-11 Juergen Vigna <jug@sad.it>
2002-04-11 Juergen Vigna <jug@sad.it>
+ * insettext.C: new function ciy() and use it for setting inset_y.
+
* insetert.C (draw): fix the x return for collapsed version.
2002-04-07 Herbert Voss <voss@perce.de>
* insetert.C (draw): fix the x return for collapsed version.
2002-04-07 Herbert Voss <voss@perce.de>
if (the_locking_inset && (cpar(bv) == inset_par)
&& (cpos(bv) == inset_pos)) {
inset_x = cx(bv) - top_x + drawTextXOffset;
if (the_locking_inset && (cpar(bv) == inset_par)
&& (cpos(bv) == inset_pos)) {
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
if (!cleared && (need_update == CURSOR)
&& !getLyXText(bv)->selection.set()) {
}
if (!cleared && (need_update == CURSOR)
&& !getLyXText(bv)->selection.set()) {
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
the_locking_inset->update(bv, font, reinit);
}
the_locking_inset->update(bv, font, reinit);
}
{
the_locking_inset = inset;
inset_x = cx(bv) - top_x + drawTextXOffset;
{
the_locking_inset = inset;
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
inset_pos = cpos(bv);
inset_par = cpar(bv);
inset_boundary = cboundary(bv);
inset_pos = cpos(bv);
inset_par = cpar(bv);
inset_boundary = cboundary(bv);
if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
inset_x = cx(bv) - top_x + drawTextXOffset;
if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
cpar(bv) == inset_par && cpos(bv) == inset_pos)
{
inset_x = cx(bv) - top_x + drawTextXOffset;
cpar(bv) == inset_par && cpos(bv) == inset_pos)
{
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
// otherwise unlock the_locking_inset and lock the new inset
the_locking_inset->insetUnlock(bv);
inset_x = cx(bv) - top_x + drawTextXOffset;
// otherwise unlock the_locking_inset and lock the new inset
the_locking_inset->insetUnlock(bv);
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
the_locking_inset = 0;
inset->insetButtonPress(bv, x - inset_x,
y - inset_y, button);
the_locking_inset = 0;
inset->insetButtonPress(bv, x - inset_x,
y - inset_y, button);
y - inset_y, button);
} else {
inset_x = cx(bv) - top_x + drawTextXOffset;
y - inset_y, button);
} else {
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
ret = inset->insetButtonRelease(bv, x - inset_x,
y - inset_y, button);
inset->edit(bv, x - inset_x,
ret = inset->insetButtonRelease(bv, x - inset_x,
y - inset_y, button);
inset->edit(bv, x - inset_x,
int const asc = lyxfont::maxAscent(font);
int const desc = lyxfont::maxDescent(font);
int const asc = lyxfont::maxAscent(font);
int const desc = lyxfont::maxDescent(font);
- bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc);
+ bv->fitLockedInsetCursor(cx(bv), ciy(bv), asc, desc);
if (show)
bv->showLockedInsetCursor(cx(bv), cy(bv), asc, desc);
setCursorVisible(true);
if (show)
bv->showLockedInsetCursor(cx(bv), cy(bv), asc, desc);
setCursorVisible(true);
if (y < 0)
y = insetDescent;
inset_x = cx(bv) - top_x + drawTextXOffset;
if (y < 0)
y = insetDescent;
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
inset->edit(bv, x - inset_x, y - inset_y, button);
if (!the_locking_inset)
return false;
inset->edit(bv, x - inset_x, y - inset_y, button);
if (!the_locking_inset)
return false;
+int InsetText::ciy(BufferView * bv) const
+{
+ LyXFont font;
+ return getLyXText(bv)->cursor.iy() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+}
+
+
pos_type InsetText::cpos(BufferView * bv) const
{
return getLyXText(bv)->cursor.pos();
pos_type InsetText::cpos(BufferView * bv) const
{
return getLyXText(bv)->cursor.pos();
restoreLyXTextState(bv, t);
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
restoreLyXTextState(bv, t);
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
restoreLyXTextState(bv, t);
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
restoreLyXTextState(bv, t);
if (the_locking_inset) {
inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
if (bv->screen()) {
t->first_y = bv->screen()->topCursorVisible(t);
}
if (bv->screen()) {
t->first_y = bv->screen()->topCursorVisible(t);
///
int cy(BufferView *) const;
///
///
int cy(BufferView *) const;
///
+ int ciy(BufferView *) const;
+ ///
lyx::pos_type cpos(BufferView *) const;
///
Paragraph * cpar(BufferView *) const;
lyx::pos_type cpos(BufferView *) const;
///
Paragraph * cpar(BufferView *) const;