Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 4ff3e93b293df92569d2bf73f3afa548e6207a4a..3902af1d596bb9fe4b6034a72157dc7fbb8e7251 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -268,7 +268,7 @@ bool BufferView::Pimpl::loadLyXFile(string const & filename, bool tolastfiles)
                // Fall through to new load. (Asger)
        }
 
-       Buffer * b;
+       Buffer * b = 0;
 
        if (found) {
                b = bufferlist.newBuffer(s);
@@ -386,8 +386,20 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
        owner_->updateWindowTitle();
 
        // This is done after the layout combox has been populated
-       if (buffer_)
-               owner_->setLayout(cursor_.paragraph().layout()->name());
+       if (buffer_) {
+               size_t i = cursor_.depth() - 1;
+               // we know we'll eventually find a paragraph
+               while (true) {
+                       CursorSlice const & slice = cursor_[i];
+                       if (!slice.inset().inMathed()) {
+                               LyXLayout_ptr const layout = slice.paragraph().layout();
+                               owner_->setLayout(layout->name());
+                               break;
+                       }
+                       BOOST_ASSERT(i>0);
+                       --i;
+               }
+       }       
 
        if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
                lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
@@ -440,9 +452,22 @@ void BufferView::Pimpl::updateScrollbar()
 
        // It would be better to fix the scrollbar to understand
        // values in [0..1] and divide everything by wh
-       int const wh = workarea().workHeight() / 4;
-       int const h = t.getPar(anchor_ref_).height();
-       workarea().setScrollbarParams(t.paragraphs().size() * wh, anchor_ref_ * wh + int(offset_ref_ * wh / float(h)), int (wh * defaultRowHeight() / float(h)));
+
+       // estimated average paragraph height:
+       int const wh = workarea().workHeight() / 4; 
+       int h = t.getPar(anchor_ref_).height();
+       // Normalize anchor/offset (MV):
+       while (offset_ref_ > h) {
+               anchor_ref_++;
+               offset_ref_ -= h;
+               h = t.getPar(anchor_ref_).height();
+       }
+       
+       // The "+ 2" makes inoculates doc bottom display against
+       // unrealistic wh values (docs with very large paragraphs) (MV)
+       workarea().setScrollbarParams((t.paragraphs().size() + 2) * wh, 
+               anchor_ref_ * wh + int(offset_ref_ * wh / float(h)), 
+               int(wh * defaultRowHeight() / float(h)));
 //     workarea().setScrollbarParams(t.paragraphs().size(), anchor_ref_, 1);
 }
 
@@ -641,12 +666,12 @@ void BufferView::Pimpl::update(Update::flags flags)
                theCoords.startUpdating();
 
                // First drawing step
-               ViewMetricsInfo vi = metrics();
+               ViewMetricsInfo vi = metrics(flags & Update::SinglePar);
                bool forceupdate(flags & Update::Force);
 
                if ((flags & Update::FitCursor) && fitCursor()) {
                        forceupdate = true;
-                       vi = metrics(flags & Update::SinglePar);
+                       vi = metrics();
                }
                if (forceupdate) {
                        // Second drawing step
@@ -864,13 +889,13 @@ void BufferView::Pimpl::trackChanges()
                // We cannot allow undos beyond the freeze point
                buffer_->undostack().clear();
        } else {
-               update();
-               bv_->text()->setCursor(cursor_, 0, 0);
-#ifdef WITH_WARNINGS
-#warning changes FIXME
-#endif
+               cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
                bool const found = lyx::find::findNextChange(bv_);
                if (found) {
+                       // We reset the cursor to the start of the
+                       // document, since the Changes Dialog is going
+                       // to search for the next change anyway.
+                       cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
                        owner_->getDialogs().show("changes");
                        return;
                }
@@ -1302,23 +1327,22 @@ ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
        int pit2 = pit;
        size_t const npit = text->paragraphs().size();
 
-       lyxerr[Debug::DEBUG]
-                << BOOST_CURRENT_FUNCTION
-                << " npit: " << npit
-                << " pit1: " << pit1
-                << " pit2: " << pit2
-                << endl;
-
-       // Rebreak anchor par
-       text->redoParagraph(pit);
-       int y0 = text->getPar(pit1).ascent() - offset_ref_;
+       // Rebreak anchor paragraph. In Single Paragraph mode, rebreak only
+       // the (main text, not inset!) paragraph containing the cursor.
+       // (if this paragraph contains insets etc., rebreaking will 
+       // recursively descend)
+       if (!singlepar || pit == cursor_.bottom().pit())
+               text->redoParagraph(pit);
+       int y0 = text->getPar(pit).ascent() - offset_ref_;
 
-       // Redo paragraphs above cursor if necessary
+       // Redo paragraphs above anchor if necessary; again, in Single Par
+       // mode, only if we encounter the (main text) one having the cursor.
        int y1 = y0;
-       while (!singlepar && y1 > 0 && pit1 > 0) {
+       while (y1 > 0 && pit1 > 0) {
                y1 -= text->getPar(pit1).ascent();
                --pit1;
-               text->redoParagraph(pit1);
+               if (!singlepar || pit1 == cursor_.bottom().pit())
+                       text->redoParagraph(pit1);
                y1 -= text->getPar(pit1).descent();
        }
 
@@ -1337,12 +1361,14 @@ ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
                anchor_ref_ = 0;
        }
 
-       // Redo paragraphs below cursor if necessary
+       // Redo paragraphs below the anchor if necessary. Single par mode:
+       // only the one containing the cursor if encountered.
        int y2 = y0;
-       while (!singlepar && y2 < bv.workHeight() && pit2 < int(npit) - 1) {
+       while (y2 < bv.workHeight() && pit2 < int(npit) - 1) {
                y2 += text->getPar(pit2).descent();
                ++pit2;
-               text->redoParagraph(pit2);
+               if (!singlepar || pit2 == cursor_.bottom().pit())
+                       text->redoParagraph(pit2);
                y2 += text->getPar(pit2).ascent();
        }
 
@@ -1354,13 +1380,29 @@ ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
        for (lyx::pit_type pit = pit1; pit <= pit2; ++pit) {
                y += text->getPar(pit).ascent();
                theCoords.parPos()[text][pit] = Point(0, y);
+               if (singlepar && pit == cursor_.bottom().pit()) {
+                       // In Single Paragraph mode, collect here the 
+                       // y1 and y2 of the (one) paragraph the cursor is in
+                       y1 = y - text->getPar(pit).ascent();
+                       y2 = y + text->getPar(pit).descent();
+               }
                y += text->getPar(pit).descent();
        }
 
+       if (singlepar) {
+               // collect cursor paragraph iter bounds
+               pit1 = cursor_.bottom().pit();
+               pit2 = cursor_.bottom().pit();
+       }
+       
        lyxerr[Debug::DEBUG]
                 << BOOST_CURRENT_FUNCTION
                 << " y1: " << y1
                 << " y2: " << y2
+                << " pit1: " << pit1
+                << " pit2: " << pit2
+                << " npit: " << npit
+                << " singlepar: " << singlepar
                 << endl;
 
        return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar);