commit 28040119576f3914a9e233bd064bf09731427046
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Feb 3 14:50:00 2016 +0100
Get rid of use_preview_ in various insets
This concerns InsetPreview, InsetIPA and InsetMathHull.
Caching such a value is bad when opening the same buffer in two views.
In this case, it is not necessary to remember use_preview_ at all,
actually.
Also remove private member dim_ which is not used and remove some trailing
whitespace.
Fixes bugs #9085 abd #9957.
diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index 8bc3d46..1da5a24 100644
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -36,7 +36,7 @@ namespace lyx {
InsetIPA::InsetIPA(Buffer * buf)
: InsetText(buf),
- preview_(new RenderPreview(this)), use_preview_(true)
+ preview_(new RenderPreview(this))
{
setDrawFrame(true);
setFrameColor(Color_insetframe);
@@ -150,9 +150,7 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const
void InsetIPA::draw(PainterInfo & pi, int x, int y) const
{
- use_preview_ = previewState(pi.base.bv);
-
- if (use_preview_) {
+ if (previewState(pi.base.bv)) {
preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y);
setPosCache(pi, x, y);
return;
@@ -170,7 +168,7 @@ void InsetIPA::edit(Cursor & cur, bool front,
EntryDirection entry_from)
Inset * InsetIPA::editXY(Cursor & cur, int x, int y)
{
- if (use_preview_) {
+ if (previewState(&cur.bv())) {
edit(cur, true, ENTRY_DIRECTION_IGNORE);
return this;
}
@@ -191,7 +189,6 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim)
const
dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += TEXT_TO_INSET_OFFSET;
- dim_ = dim;
dim.wid += TEXT_TO_INSET_OFFSET;
// insert a one pixel gap
dim.wid += 1;
diff --git a/src/insets/InsetIPA.h b/src/insets/InsetIPA.h
index b3b90ee..783871d 100644
--- a/src/insets/InsetIPA.h
+++ b/src/insets/InsetIPA.h
@@ -94,12 +94,6 @@ protected:
///
boost::scoped_ptr<RenderPreview> preview_;
- ///
- mutable bool use_preview_;
-
-private:
- ///
- mutable Dimension dim_;
};
diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index d327fe5..7577741 100644
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -34,16 +34,15 @@ using namespace std;
namespace lyx {
-InsetPreview::InsetPreview(Buffer * buf)
- : InsetText(buf),
- preview_(new RenderPreview(this)), use_preview_(true)
+InsetPreview::InsetPreview(Buffer * buf)
+ : InsetText(buf), preview_(new RenderPreview(this))
{
setDrawFrame(true);
setFrameColor(Color_previewframe);
}
-InsetPreview::~InsetPreview()
+InsetPreview::~InsetPreview()
{}
@@ -80,7 +79,7 @@ void InsetPreview::addPreview(DocIterator const & inset_pos,
}
-void InsetPreview::preparePreview(DocIterator const & pos) const
+void InsetPreview::preparePreview(DocIterator const & pos) const
{
TexRow texrow;
odocstringstream str;
@@ -137,15 +136,12 @@ void InsetPreview::reloadPreview(DocIterator const & pos)
const
void InsetPreview::draw(PainterInfo & pi, int x, int y) const
{
- use_preview_ = previewState(pi.base.bv);
-
- if (use_preview_) {
+ if (previewState(pi.base.bv)) {
// one pixel gap in front
preview_->draw(pi, x + 1 + TEXT_TO_INSET_OFFSET, y);
setPosCache(pi, x, y);
- return;
- }
- InsetText::draw(pi, x, y);
+ } else
+ InsetText::draw(pi, x, y);
}
@@ -158,7 +154,7 @@ void InsetPreview::edit(Cursor & cur, bool front,
EntryDirection entry_from)
Inset * InsetPreview::editXY(Cursor & cur, int x, int y)
{
- if (use_preview_) {
+ if (previewState(&cur.bv())) {
edit(cur, true, ENTRY_DIRECTION_IGNORE);
return this;
}
@@ -172,14 +168,13 @@ void InsetPreview::metrics(MetricsInfo & mi, Dimension &
dim) const
if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim);
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
-
+
dim.wid = max(dim.wid, 4);
dim.asc = max(dim.asc, 4);
-
+
dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += TEXT_TO_INSET_OFFSET;
- dim_ = dim;
dim.wid += TEXT_TO_INSET_OFFSET;
// insert a one pixel gap
dim.wid += 1;
diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index a7076c4..1c80f3e 100644
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -81,12 +81,7 @@ protected:
///
boost::scoped_ptr<RenderPreview> preview_;
- ///
- mutable bool use_preview_;
-private:
- ///
- mutable Dimension dim_;
};
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 94e9ec4..a782751 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -158,7 +158,7 @@ static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
: InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
- preview_(new RenderPreview(this)), use_preview_(false)
+ preview_(new RenderPreview(this))
{
//lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
//lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
@@ -173,7 +173,7 @@ InsetMathHull::InsetMathHull(Buffer * buf)
InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
: InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1,
NUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
- preview_(new RenderPreview(this)), use_preview_(false)
+ preview_(new RenderPreview(this))
{
buffer_ = buf;
initMath();
@@ -316,7 +316,7 @@ void InsetMathHull::addToToc(DocIterator const & pit, bool
output_active,
Inset * InsetMathHull::editXY(Cursor & cur, int x, int y)
{
- if (use_preview_) {
+ if (previewState(&cur.bv())) {
edit(cur, true);
return this;
}
@@ -526,7 +526,6 @@ void InsetMathHull::drawBackground(PainterInfo & pi, int x,
int y) const
void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
{
BufferView const * const bv = pi.base.bv;
- use_preview_ = previewState(bv);
if (type_ == hullRegexp) {
Dimension const dim = dimension(*bv);
@@ -534,7 +533,7 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y)
const
dim.width() - 2, dim.height() - 2, Color_regexpframe);
}
- if (use_preview_) {
+ if (previewState(bv)) {
Dimension const dim = dimension(*bv);
if (previewTooSmall(dim)) {
// we have an extra frame
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index e02c619..3b447c3 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -256,8 +256,6 @@ private:
///
boost::scoped_ptr<RenderPreview> preview_;
///
- mutable bool use_preview_;
- ///
DocIterator docit_;
///
typedef std::map<docstring, int> CounterMap;
