#include "mathed/formulabase.h"
+#include "graphics/Previews.h"
+
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/filetools.h"
{
workarea_.reset(WorkAreaFactory::create(xpos, ypos, width, height));
screen_.reset(LyXScreenFactory::create(workarea()));
-
+
// Setup the signals
workarea().scrollDocView.connect(boost::bind(&BufferView::Pimpl::scrollDocView, this, _1));
workarea().workAreaResize
return *workarea_.get();
}
-
+
LyXScreen & BufferView::Pimpl::screen() const
{
return *screen_.get();
if (buffer_) {
lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl;
buffer_->addUser(bv_);
+
// If we don't have a text object for this, we make one
if (bv_->text == 0) {
resizeCurrentBuffer();
- } else {
- updateScreen();
- updateScrollbar();
}
+
+ // FIXME: needed when ?
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- owner_->updateMenubar();
- owner_->updateToolbar();
+
// Similarly, buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs()->updateBufferDependent(true);
- redraw();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
- owner_->updateMenubar();
- owner_->updateToolbar();
owner_->getDialogs()->hideBufferDependent();
- updateScrollbar();
- workarea().redraw();
// Also remove all remaining text's from the testcache.
// (there should not be any!) (if there is any it is a
textcache.show(lyxerr, "buffer delete all");
textcache.clear();
}
- // should update layoutchoice even if we don't have a buffer.
- owner_->updateLayoutChoice();
+ repaint();
+ updateScrollbar();
+ owner_->updateMenubar();
+ owner_->updateToolbar();
+ owner_->updateLayoutChoice();
owner_->updateWindowTitle();
-}
-
-void BufferView::Pimpl::redraw()
-{
- lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
- workarea().redraw();
+ if (grfx::Previews::activated() && buffer_)
+ grfx::Previews::get().generateBufferPreviews(buffer_);
}
bv_->owner()->getDialogs()->updateParagraph();
if (ret)
- updateScrollbar();
+ updateScrollbar();
return ret;
}
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- // this will scroll the screen such that the cursor becomes visible
- updateScrollbar();
- redraw();
-
setState();
owner_->allowInput();
}
-void BufferView::Pimpl::updateScreen()
+void BufferView::Pimpl::repaint()
{
// Regenerate the screen.
screen().redraw(bv_->text, bv_);
LyXText const & t = *bv_->text;
+ lyxerr[Debug::GUI] << "Updating scrollbar: h " << t.height << ", first_y "
+ << t.first_y << ", default height " << t.defaultHeight() << endl;
+
workarea().setScrollbarParams(t.height, t.first_y, t.defaultHeight());
}
return 0;
LyXText const * t = bv_->text;
-
- double const diff = t->defaultHeight()
+
+ double const diff = t->defaultHeight()
+ double(time) * double(time) * 0.125;
-
+
scrollDocView(int(diff));
workarea().setScrollbarParams(t->height, t->first_y, t->defaultHeight());
return 0;
void BufferView::Pimpl::workAreaResize()
{
static int work_area_width;
- static unsigned int work_area_height;
+ static int work_area_height;
bool const widthChange = workarea().workWidth() != work_area_width;
bool const heightChange = workarea().workHeight() != work_area_height;
// update from work area
work_area_width = workarea().workWidth();
work_area_height = workarea().workHeight();
+
if (buffer_ != 0) {
if (widthChange) {
// The visible LyXView need a resize
if (lyxerr.debugging())
textcache.show(lyxerr, "Expose delete all");
textcache.clear();
- // FIXME: this is aalready done in resizeCurrentBuffer() ??
+ // FIXME: this is aalready done in resizeCurrentBuffer() ??
buffer_->resizeInsets(bv_);
} else if (heightChange) {
// fitCursor() ensures we don't jump back
// to the start of the document on vertical
// resize
fitCursor();
-
- // The main window size has changed, repaint most stuff
- redraw();
- } else {
- screen().redraw(bv_->text, bv_);
}
- } else {
- screen().redraw(bv_->text, bv_);
+ }
+
+ if (widthChange || heightChange) {
+ repaint();
}
// always make sure that the scrollbar is sane.
if (text->inset_owner) {
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
- updateInset(text->inset_owner, false);
+ updateInset(text->inset_owner, false);
} else {
- update();
+ update();
}
if ((f & FITCUR)) {
bv_->text->setCursor(bv_, par,
min(par->size(), saved_positions[i].par_pos));
- update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+ update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
if (i > 0) {
ostringstream str;
str << _("Moved to bookmark") << ' ' << i;
void BufferView::Pimpl::center()
{
- beforeChange(bv_->text);
- if (bv_->text->cursor.y() > static_cast<int>((workarea().workHeight() / 2))) {
- screen().draw(bv_->text, bv_, bv_->text->cursor.y() - workarea().workHeight() / 2);
- } else {
- screen().draw(bv_->text, bv_, 0);
+ LyXText * t = bv_->text;
+
+ beforeChange(t);
+ int const half_height = workarea().workHeight() / 2;
+ int new_y = 0;
+
+ if (t->cursor.y() > half_height) {
+ new_y = t->cursor.y() - half_height;
}
- update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
- redraw();
+
+ // FIXME: can we do this w/o calling screen directly ?
+ // This updates first_y but means the fitCursor() call
+ // from the update(FITCUR) doesn't realise that we might
+ // have moved (e.g. from GOTOPARAGRAPH), so doesn't cause
+ // the scrollbar to be updated as it should, so we have
+ // to do it manually. Any operation that does a center()
+ // and also might have moved first_y must make sure to call
+ // updateScrollbar() currently. Never mind that this is a
+ // pretty obfuscated way of updating t->first_y
+ screen().draw(t, bv_, new_y);
+
+ update(t, BufferView::SELECT | BufferView::FITCUR);
}
if (!lt->selection.set())
workarea().haveSelection(false);
-
+
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
//owner->showState();
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
- string const & obs = tclass[layout].obsoleted_by();
+ string const & obs = tclass[layout]->obsoleted_by();
if (!obs.empty())
layout = obs;
}
Paragraph * spar = lt->selection.start.par();
Paragraph * epar = lt->selection.end.par()->next();
while(spar != epar) {
- if (spar->layout() != current_layout) {
+ if (spar->layout()->name() != current_layout) {
change_layout = true;
break;
}
case LFUN_PROTECTEDSPACE:
{
LyXText * lt = bv_->getLyXText();
+ LyXLayout_ptr const & style = lt->cursor.par()->layout();
- LyXLayout const & style = tclass[lt->cursor.par()->layout()];
-
- if (style.free_spacing) {
+ if (style->free_spacing) {
lt->insertChar(bv_, ' ');
update(lt,
BufferView::SELECT
}
InsetIndex * inset = new InsetIndex(InsetCommandParams("index", entry));
-
+
if (!insertInset(inset)) {
delete inset;
} else {
hideCursor();
- LyXLayout const & style =
- textclasslist[bv_->buffer()->params.textclass][par->layout()];
+ LyXLayout_ptr const & style = par->layout();
- if (style.pass_thru ||
+ if (style->pass_thru ||
(!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\"");
}
void BufferView::Pimpl::insertAndEditInset(Inset * inset)
{
+#if 0
if (insertInset(inset))
inset->edit(bv_);
else
delete inset;
+#else
+ bool gotsel = false;
+
+ if (bv_->getLyXText()->selection.set()) {
+ bv_->getLyXText()->cutSelection(bv_, true, false);
+ gotsel = true;
+ }
+
+ if (insertInset(inset)) {
+ inset->edit(bv_);
+ if (gotsel)
+ owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION);
+ }
+ else
+ delete inset;
+#endif
}
projects / lyx.git / blobdiff