#include "Buffer.h"
#include "CoordCache.h"
#include "Cursor.h"
-#include "debug.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
#include "Encoding.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "Language.h"
#include "Layout.h"
#include "LyXRC.h"
#include "insets/InsetText.h"
+#include "support/debug.h"
#include "support/textutils.h"
#include <boost/crc.hpp>
-using std::endl;
-using std::max;
-using std::string;
+#include <ostream>
+using namespace std;
namespace lyx {
row_.pos());
}
-
-void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
-{
- x_ += 1;
-
- int const y0 = yo_;
- int const y1 = y0 - defaultRowHeight() / 2;
-
- pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
-
- if (pm_.hfillExpansion(row_, pos)) {
- int const y2 = (y0 + y1) / 2;
-
- if (pos >= body_pos) {
- pi_.pain.line(int(x_), y2, int(x_ + row_.hfill), y2,
- Color_added_space,
- Painter::line_onoffdash);
- x_ += row_.hfill;
- } else {
- pi_.pain.line(int(x_), y2, int(x_ + row_.label_hfill), y2,
- Color_added_space,
- Painter::line_onoffdash);
- x_ += row_.label_hfill;
- }
- pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
- }
- x_ += 2;
-}
-
-
// If you want to debug inset metrics uncomment the following line:
//#define DEBUG_METRICS
// This draws green lines around each inset.
Font const font = text_metrics_.getDisplayFont(pit_, pos);
BOOST_ASSERT(inset);
+ // Backup full_repaint status because some insets (InsetTabular)
+ // requires a full repaint
+ bool pi_full_repaint = pi_.full_repaint;
+
// FIXME: We should always use font, see documentation of
// noFontChange() in Inset.h.
pi_.base.font = inset->noFontChange() ?
Dimension const & dim = pm_.insetDimension(inset);
- paintForeignMark(x_, font, dim.descent());
+ paintForeignMark(x_, font.language(), dim.descent());
x_ += dim.width();
+ // Restore full_repaint status.
+ pi_.full_repaint = pi_full_repaint;
+
#ifdef DEBUG_METRICS
int const x1 = int(x_ - dim.width());
Dimension dim2;
if (dim.wid != dim2.wid)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw width " << dim.width()
- << "> metrics width " << dim2.wid << "." << std::endl;
+ << "> metrics width " << dim2.wid << "." << endl;
if (dim->asc != dim2.asc)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.ascent()
- << "> metrics ascent " << dim2.asc << "." << std::endl;
+ << "> metrics ascent " << dim2.asc << "." << endl;
if (dim2.descent() != dim.des)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.descent()
- << "> metrics descent " << dim2.des << "." << std::endl;
+ << "> metrics descent " << dim2.des << "." << endl;
BOOST_ASSERT(dim2.wid == dim.wid);
BOOST_ASSERT(dim2.asc == dim.asc);
BOOST_ASSERT(dim2.des == dim.des);
Change::Type const prev_change = par_.lookupChange(pos).type;
// first character
- std::vector<char_type> str;
+ vector<char_type> str;
str.reserve(100);
str.push_back(par_.getChar(pos));
}
-void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
+void RowPainter::paintForeignMark(double orig_x, Language const * lang,
+ int desc)
{
if (!lyxrc.mark_foreign_language)
return;
- if (font.language() == latex_language)
+ if (lang == latex_language)
return;
- if (font.language() == pi_.base.bv->buffer().params().language)
+ if (lang == pi_.base.bv->buffer().params().language)
return;
int const y = yo_ + 1 + desc;
char_type const c = par_.getChar(pos);
// special case languages
- std::string const & lang = orig_font.language()->lang();
+ string const & lang = orig_font.language()->lang();
bool const hebrew = lang == "hebrew";
bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
lang == "farsi";
paintArabicComposeChar(vpos, orig_font.fontInfo());
}
- paintForeignMark(orig_x, orig_font);
+ paintForeignMark(orig_x, orig_font.language());
}
bool const is_rtl = text_.isRTL(buffer, par_);
bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
- //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
+ //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
// should we print a label?
if (layout->labeltype >= LABEL_STATIC
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
- int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
+ int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
+ int x = is_rtl ? nestMargin() + changebarMargin()
+ : max_row_width - text_metrics_.rightMargin(pm_);
- if (width_ - int(row_.width()) <= size)
- x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
+ // If needed, move the box a bit to avoid overlapping with text.
+ int const rem = max_row_width - row_.width();
+ if (rem <= 0)
+ x += is_rtl ? rem : - rem;
if (endlabel == END_LABEL_BOX)
pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
{
pos_type const end = row_.endpos();
for (pos_type pos = row_.pos(); pos != end; ++pos) {
- if (!par_.isInset(pos))
- continue;
-
// If outer row has changed, nested insets are repaint completely.
Inset const * inset = par_.getInset(pos);
-
+ if (!inset)
+ continue;
if (x_ > pi_.base.bv->workWidth())
continue;
-
x_ = pi_.base.bv->coordCache().getInsets().x(inset);
paintInset(inset, pos);
}
last_strikeout_x = int(x_);
}
- bool const highly_editable_inset = par_.isInset(pos)
- && par_.getInset(pos)->editable() == Inset::HIGHLY_EDITABLE;
+ Inset const * inset = par_.getInset(pos);
+ bool const highly_editable_inset = inset
+ && inset->editable() == Inset::HIGHLY_EDITABLE;
// If we reach the end of a struck out range, paint it.
// We also don't paint across things like tables
x_ += row_.label_hfill + lwidth - width_pos;
}
- if (par_.isHfill(pos)) {
- paintHfill(pos, body_pos);
- ++vpos;
-
- } else if (par_.isSeparator(pos)) {
+ if (par_.isSeparator(pos)) {
Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
double const orig_x = x_;
x_ += width_pos;
if (pos >= body_pos)
x_ += row_.separator;
- paintForeignMark(orig_x, orig_font);
+ paintForeignMark(orig_x, orig_font.language());
++vpos;
- } else if (par_.isInset(pos)) {
+ } else if (inset) {
// If outer row has changed, nested insets are repaint completely.
- Inset const * inset = par_.getInset(pos);
pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
paintInset(inset, pos);
++vpos;
projects / lyx.git / blobdiff