LyXScreen::LyXScreen()
- : cursor_visible_(false), greyed_out_(true)
+ : greyed_out_(true), cursor_visible_(false)
{
// Start loading the pixmap as soon as possible
if (lyxrc.show_banner) {
SplashScreen const & splash = SplashScreen::get();
- splash.connect(boost::bind(&LyXScreen::greyOut, this));
+ splash.connect(boost::bind(&LyXScreen::checkAndGreyOut, this));
splash.startLoading();
}
}
}
+void LyXScreen::checkAndGreyOut()
+{
+ if (greyed_out_)
+ greyOut();
+}
+
+
void LyXScreen::showCursor(BufferView & bv)
{
// this is needed to make sure we copy back the right
if (realfont.language() == latex_language)
shape = BAR_SHAPE;
- int ascent = font_metrics::maxAscent(realfont);
- int descent = font_metrics::maxDescent(realfont);
+ int ascent, descent;
+ bv.cursor().getDim(ascent, descent);
int h = ascent + descent;
int x = 0;
int y = 0;
bv.cursor().getPos(x, y);
- y -= ascent + bv.top_y();
+ y -= ascent;
//lyxerr << "LyXScreen::showCursor x: " << x << " y: " << y << endl;
// if it doesn't fit entirely on the screen, don't try to show it
}
-bool LyXScreen::fitManualCursor(BufferView * bv, LyXText *,
- int x, int y, int asc, int desc)
-{
- lyxerr << "LyXScreen::fitManualCursor x: " << x << " y: " << y << std::endl;
- int const vheight = workarea().workHeight();
- int const topy = bv->top_y();
- int newtop = topy;
-
- if (y + desc - topy >= vheight)
- newtop = y - 3 * vheight / 4; // the scroll region must be so big!!
- else if (y - asc < topy && topy > 0)
- newtop = y - vheight / 4;
-
- newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
-
- if (newtop == topy)
- return false;
-
- bv->top_y(newtop);
- return true;
-}
-
-
-unsigned int LyXScreen::topCursorVisible(LyXText * text)
-{
- LyXCursor const & cursor = text->cursor;
- int top_y = text->bv()->top_y();
- int newtop = top_y;
- unsigned int const vheight = workarea().workHeight();
-
- Row & row = *text->cursorPar()->getRow(cursor.pos());
-
- if (int(cursor.y() - row.baseline() + row.height() - top_y) >= vheight) {
- if (row.height() < vheight
- && row.height() > vheight / 4) {
- newtop = cursor.y()
- + row.height()
- - row.baseline() - vheight;
- } else {
- // scroll down, the scroll region must be so big!!
- newtop = cursor.y() - vheight / 2;
- }
-
- } else if (int(cursor.y() - row.baseline()) < top_y && top_y > 0) {
- if (row.height() < vheight && row.height() > vheight / 4) {
- newtop = cursor.y() - row.baseline();
- } else {
- // scroll up
- newtop = cursor.y() - vheight / 2;
- newtop = min(newtop, top_y);
- }
- }
-
- return max(newtop, 0);
-}
-
-
-bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
+void LyXScreen::redraw(BufferView & bv, ViewMetricsInfo const & vi)
{
- // Is a change necessary?
- int const newtop = topCursorVisible(text);
- bool const result = (newtop != bv->top_y());
- bv->top_y(newtop);
- return result;
-}
-
-
-void LyXScreen::redraw(BufferView & bv)
-{
- greyed_out_ = !bv.text;
-
- if (greyed_out_) {
- greyOut();
- return;
- }
-
+ greyed_out_ = false;
workarea().getPainter().start();
-
hideCursor();
-
- int const y = paintText(bv);
-
- // maybe we have to clear the screen at the bottom
- int const y2 = workarea().workHeight();
- if (y < y2 && !bv.text->isInInset()) {
- workarea().getPainter().fillRectangle(0, y,
- workarea().workWidth(), y2 - y,
- LColor::bottomarea);
- }
-
- lyxerr << "Redraw screen" << endl;
-
+ paintText(bv, vi);
+ lyxerr[Debug::DEBUG] << "Redraw screen" << endl;
expose(0, 0, workarea().workWidth(), workarea().workHeight());
-
workarea().getPainter().end();
+ showCursor(bv);
}
void LyXScreen::greyOut()
{
- if (!greyed_out_)
- return;
-
+ greyed_out_ = true;
workarea().getPainter().start();
workarea().getPainter().fillRectangle(0, 0,