Improve fullscreen capabilities ( http://bugzilla.lyx.org/show_bug.cgi?id=4146 ).

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a57253ecc9b1567ea64f68eb4072eca542db57fc..93be5ae5dfd7e09d08f4292e3727ea493af7e7e6 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -379,7 +379,16 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        DocIterator parPos = text_->macrocontextPosition();
        if (!parPos.empty())
                parPos.pit() = pit;
-
+       else {
+               LYXERR(Debug::INFO, "MacroContext not initialised!"
+                       << " Going through the buffer again and hope"
+                       << " the context is better then.");
+               updateLabels(bv_->buffer());
+               parPos = text_->macrocontextPosition();
+               BOOST_ASSERT(!parPos.empty());
+               parPos.pit() = pit;
+       }
+       
        // redo insets
        // FIXME: We should always use getFont(), see documentation of
        // noFontChange() in Inset.h.
@@ -561,11 +570,8 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                        align = par.params().align();
 
                // Display-style insets should always be on a centred row
-               // The test on par.size() is to catch zero-size pars, which
-               // would trigger the assert in Paragraph::getInset().
-               //inset = par.size() ? par.getInset(row.pos()) : 0;
-               if (row.pos() < par.size() && par.isInset(row.pos())) {
-                       switch(par.getInset(row.pos())->display()) {
+               if (Inset const * inset = par.getInset(row.pos())) {
+                       switch (inset->display()) {
                                case Inset::AlignLeft:
                                        align = LYX_ALIGN_BLOCK;
                                        break;
@@ -774,20 +780,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                        point = i + 1;
                        break;
                }
+               Inset const * inset = 0;
                // Break before...
                if (i + 1 < end) {
-                       if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+                       if ((inset = par.getInset(i + 1)) && inset->display()) {
                                point = i + 1;
                                break;
                        }
                        // ...and after.
-                       if (par.isInset(i) && par.getInset(i)->display()) {
+                       if ((inset = par.getInset(i)) && inset->display()) {
                                point = i + 1;
                                break;
                        }
                }
 
-               if (!par.isInset(i) || par.getInset(i)->isChar()) {
+               inset = par.getInset(i);
+               if (!inset || inset->isChar()) {
                        // some insets are line separators too
                        if (par.isLineSeparator(i)) {
                                // register breakpoint:
@@ -1116,9 +1124,10 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
        bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
        if (lastrow &&
            ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-            (!rtl && !left_side && vc == end  && x > tmpx + 5)))
-               c = end;
-       else if (vc == row.pos()) {
+            (!rtl && !left_side && vc == end  && x > tmpx + 5))) {
+               if (!par.isNewline(end - 1))
+                       c = end;
+       } else if (vc == row.pos()) {
                c = bidi.vis2log(vc);
                if (bidi.level(c) % 2 == 1)
                        ++c;
@@ -1811,7 +1820,7 @@ int TextMetrics::leftMargin(int max_width,
               || layout->labeltype == LABEL_TOP_ENVIRONMENT
               || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
               || (layout->labeltype == LABEL_STATIC
-                  && layout->latextype == LATEX_ENVIRONMENT
+                        && layout->latextype == LATEX_ENVIRONMENT
                   && !isFirstInSequence(pit, pars)))
            && align == LYX_ALIGN_BLOCK
            && !par.params().noindent()
@@ -1895,15 +1904,10 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
                // Don't paint the row if a full repaint has not been requested
                // and if it has not changed.
                if (!pi.full_repaint && !row_has_changed) {
-                       // Backup full_repaint status because some Inset (InsetTabular)
-                       // requires a full repaint
-                       bool tmp = pi.full_repaint;
                        // Paint only the insets if the text itself is
                        // unchanged.
                        rp.paintOnlyInsets();
                        y += row.descent();
-                       // Restore full_repaint status.
-                       pi.full_repaint = tmp;
                        continue;
                }