int const asc = fm.maxAscent();
int const des = fm.maxDescent();
Point const p = getPos(d->cursor_);
- if (p.y_ - asc >= 0 && p.y_ + des < height_)
+ if (p.y - asc >= 0 && p.y + des < height_)
return false;
}
return true;
newy = last;
break;
case CUR_INSIDE:
- int const y = getPos(oldcur).y_;
+ int const y = getPos(oldcur).y;
newy = min(last, max(y, first));
if (y == newy)
return;
CursorStatus BufferView::cursorStatus(DocIterator const & dit) const
{
Point const p = getPos(dit);
- if (p.y_ < 0)
+ if (p.y < 0)
return CUR_ABOVE;
- if (p.y_ > workHeight())
+ if (p.y > workHeight())
return CUR_BELOW;
return CUR_INSIDE;
}
LBUFERR(!pm.rows().empty());
// FIXME: smooth scrolling doesn't work in mathed.
CursorSlice const & cs = dit.innerTextSlice();
- int const ypos = pm.position() + coordOffset(dit).y_;
+ int const ypos = pm.position() + coordOffset(dit).y;
ParagraphMetrics const & inner_pm =
textMetrics(cs.text()).parMetrics(cs.pit());
Dimension const & row_dim =
d->inlineCompletionPos_ = DocIterator();
tm.redoParagraph(bot_pit);
- int const offset = coordOffset(dit).y_;
+ int const offset = coordOffset(dit).y;
pit_type const old_pit = d->anchor_pit_;
d->anchor_pit_ = bot_pit;
break;
case LFUN_ALL_CHANGES_ACCEPT: {
+ UndoGroupHelper helper(cur);
// select complete document
cur.reset();
cur.selHandle(true);
}
case LFUN_ALL_CHANGES_REJECT: {
+ UndoGroupHelper helper(cur);
// select complete document
cur.reset();
cur.selHandle(true);
Point p = getPos(cur);
// This code has been commented out to enable to scroll down a
// document, even if there are large insets in it (see bug #5465).
- /*if (p.y_ < 0 || p.y_ > height_) {
+ /*if (p.y < 0 || p.y > height_) {
// The cursor is off-screen so recenter before proceeding.
showCursor();
p = getPos(cur);
if (scrolled)
processUpdateFlags(Update::Force);
- d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
+ d->text_metrics_[&buffer_.text()].editXY(cur, p.x, p.y,
true, act == LFUN_SCREEN_UP);
//FIXME: what to do with cur.x_target()?
bool update = in_texted && cur.bv().checkDepm(cur, old);
cur.finishUndo();
break;
}
- int y = getPos(cur).y_;
+ int y = getPos(cur).y;
int const ymin = y - height_ + defaultRowHeight();
while (y > ymin && cur.up())
- y = getPos(cur).y_;
+ y = getPos(cur).y;
cur.finishUndo();
dr.screenUpdate(Update::SinglePar | Update::FitCursor);
cur.finishUndo();
break;
}
- int y = getPos(cur).y_;
+ int y = getPos(cur).y;
int const ymax = y + height_ - defaultRowHeight();
while (y < ymax && cur.down())
- y = getPos(cur).y_;
+ y = getPos(cur).y;
cur.finishUndo();
dr.screenUpdate(Update::SinglePar | Update::FitCursor);
void BufferView::updateHoveredInset() const
{
// Get inset under mouse, if there is one.
- int const x = d->mouse_position_cache_.x_;
- int const y = d->mouse_position_cache_.y_;
+ int const x = d->mouse_position_cache_.x;
+ int const y = d->mouse_position_cache_.y;
Inset const * covering_inset = getCoveringInset(buffer_.text(), x, y);
if (covering_inset && covering_inset->asInsetMath()) {
Inset const * inner_inset = clickableMathInset(
if (need_redraw) {
LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
- << d->mouse_position_cache_.x_ << ", "
- << d->mouse_position_cache_.y_ << ")");
+ << d->mouse_position_cache_.x << ", "
+ << d->mouse_position_cache_.y << ")");
d->update_strategy_ = DecorationUpdate;
// make sure we stay within the screen...
cmd.set_y(min(max(cmd.y(), -1), height_));
- d->mouse_position_cache_.x_ = cmd.x();
- d->mouse_position_cache_.y_ = cmd.y();
+ d->mouse_position_cache_.x = cmd.x();
+ d->mouse_position_cache_.y = cmd.y();
d->mouse_selecting_ =
cmd.action() == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::button1;
// offset from outer paragraph
Point p = coordOffset(dit);
- p.y_ += tm.parMetrics(bot.pit()).position();
+ p.y += tm.parMetrics(bot.pit()).position();
return p;
}
p = getPos(cur);
// center fat carets horizontally
- p.x_ -= dim.wid / 2;
+ p.x -= dim.wid / 2;
// p is top-left
- p.y_ -= dim.asc;
+ p.y -= dim.asc;
}
bool const slant = fm.italic() && cur.inTexted() && !cur.selection();
double const slope = slant ? fm.italicSlope() : 0;
cg.shapes.push_back(
- {{iround(p.x_ + dim.asc * slope), p.y_},
- {iround(p.x_ - dim.des * slope), p.y_ + dim.height()},
- {iround(p.x_ + dir * dim.wid - dim.des * slope), p.y_ + dim.height()},
- {iround(p.x_ + dir * dim.wid + dim.asc * slope), p.y_}}
+ {{iround(p.x + dim.asc * slope), p.y},
+ {iround(p.x - dim.des * slope), p.y + dim.height()},
+ {iround(p.x + dir * dim.wid - dim.des * slope), p.y + dim.height()},
+ {iround(p.x + dir * dim.wid + dim.asc * slope), p.y}}
);
// The language indicator _| (if needed)
if (!((realfont.language() == doclang && isrtl == doclang->rightToLeft())
|| realfont.language() == latex_language)) {
int const lx = dim.height() / 3;
- int const xx = iround(p.x_ - dim.des * slope);
- int const yy = p.y_ + dim.height();
+ int const xx = iround(p.x - dim.des * slope);
+ int const yy = p.y + dim.height();
cg.shapes.push_back(
{{xx, yy - dim.wid},
{xx + dir * (dim.wid + lx - 1), yy - dim.wid},
// The completion triangle |> (if needed)
if (complet) {
- int const m = p.y_ + dim.height() / 2;
+ int const m = p.y + dim.height() / 2;
int const d = dim.height() / 8;
// offset for slanted carret
int const sx = iround((dim.asc - (dim.height() / 2 - d)) * slope);
// starting position x
- int const xx = p.x_ + dir * dim.wid + sx;
+ int const xx = p.x + dir * dim.wid + sx;
cg.shapes.push_back(
{{xx, m - d},
{xx + dir * d, m},
cg.bottom = -1000000;
for (auto const & shape : cg.shapes)
for (Point const & p : shape) {
- cg.left = min(cg.left, p.x_);
- cg.right = max(cg.right, p.x_);
- cg.top = min(cg.top, p.y_);
- cg.bottom = max(cg.bottom, p.y_);
+ cg.left = min(cg.left, p.x);
+ cg.right = max(cg.right, p.x);
+ cg.top = min(cg.top, p.y);
+ cg.bottom = max(cg.bottom, p.y);
}
}
caretPosAndDim(p, dim);
// does the cursor touch the screen ?
- if (p.y_ + dim.height() < 0 || p.y_ >= workHeight())
+ if (p.y + dim.height() < 0 || p.y >= workHeight())
return false;
return true;
}
setCurrentRowSlice(rowSlice);
// Current x position of the cursor in pixels
- int cur_x = getPos(d->cursor_).x_;
+ int cur_x = getPos(d->cursor_).x;
// Horizontal scroll offset of the cursor row in pixels
int offset = d->horiz_scroll_offset_;
if (!cur.inTexted())
break;
TextMetrics const & tm = textMetrics(cur.text());
- if (d->caret_geometry_.left >= tm.origin().x_
- && d->caret_geometry_.right <= tm.origin().x_ + tm.dim().width())
+ if (d->caret_geometry_.left >= tm.origin().x
+ && d->caret_geometry_.right <= tm.origin().x + tm.dim().width())
break;
cur.pop();
}
projects / lyx.git / blobdiff