Revert "Add possibility for command inset to inherit enclosing font"

The new method was badly named, it was not supposed to override the
existing inheritFont.

Fixes bug #10682.

This reverts commit 555338048d417d4532fe954239a0e9e29dd5ee6d.

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index 4f6f68cef2d96fd89eaf41a772356cf0ef6ea53c..038065ffc0dc8b9a6ddf71d67fd47c08c15820c2 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -48,8 +48,6 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       bool inheritFont() const { return true; }
-       ///
        InsetCode lyxCode() const { return BIBTEX_CODE; }
        ///
        DisplayType display() const { return AlignCenter; }

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index 18a9305a899459e4fa8aaa811432dbe250415e24..992a85ee2198978927472592a595daf32a4d6f4a 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -43,8 +43,6 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       bool inheritFont() const { return true; }
-       ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index fe10466e238b43b36f1c3796e10d997ea9a2c6e7..f4f169232b2a8cfb50f55547348f843543b28c57 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -96,8 +96,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0),
-                      inheritFont());
+       button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0));
        button_.metrics(mi, dim);
 }
 

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 78e6d7fc5d6f6c9aba604018db08e681d9ce5220..0514e09ffe987d38e19fb07608486db6e3460ebc 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -125,8 +125,6 @@ private:
        RenderButton & button() const { return button_; }
        /// This should provide the text for the button
        virtual docstring screenLabel() const = 0;
-       /// This should return true when font is inherited from text
-       virtual bool inheritFont() const { return false; }
 
        /// \name Static public methods obligated for InsetCommand derived classes
        //@{

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 8efdd3e97e3972c693123789f8141dc4ba3bb99e..a88769b8ee3c4a587ae259b59251acc23b2c9087 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -623,7 +623,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                        renderer_.reset(new RenderButton);
                        button_ptr = renderer_->asButton();
                }
-               button_ptr->update(screenLabel(params_, buffer()), true, false);
+               button_ptr->update(screenLabel(params_, buffer()), true);
                return;
        }
 

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 06b52381137c1a449bc9ac671d32237a8da95855..3fc35fe308a295e2c2eea6a38cbe8450a69880e2 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -1022,7 +1022,7 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
        } else {
                if (!set_label_) {
                        set_label_ = true;
-                       button_.update(screenLabel(), true, false);
+                       button_.update(screenLabel(), true);
                }
                button_.metrics(mi, dim);
        }
@@ -1207,7 +1207,7 @@ void InsetInclude::updateCommand()
 
 void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       button_.update(screenLabel(), true, false);
+       button_.update(screenLabel(), true);
 
        Buffer const * const childbuffer = getChildBuffer();
        if (childbuffer) {

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 15f1225950fd56fc8f7c873699793b128085e8bf..066a596630b15f55399e015f96bdafd364780a7d 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -45,12 +45,10 @@ public:
        docstring toolTip(BufferView const &, int, int) const
                { return tooltip_; }
        ///
-       docstring getTOCString() const;
+  docstring getTOCString() const;
        ///
        bool hasSettings() const { return true; }
        ///
-       bool inheritFont() const { return true; }
-       ///
        InsetCode lyxCode() const { return REF_CODE; }
        ///
        DisplayType display() const { return Inline; }

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 7f983c5705a27ee2a162d746e5eb4592607dd32f..430b8dd53c1b94d43fd4452c1c965fa1fdebd3b1 100644 (file)
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -32,18 +32,16 @@ RenderBase * RenderButton::clone(Inset const *) const
 }
 
 
-void RenderButton::update(docstring const & text, bool editable,
-                          bool inherit_font)
+void RenderButton::update(docstring const & text, bool editable)
 {
        text_ = text;
        editable_ = editable;
-       inherit_font_ = inherit_font;
 }
 
 
-void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 {
-       FontInfo font = inherit_font_ ? mi.base.font : sane_font;
+       FontInfo font = sane_font;
        font.decSize();
        frontend::FontMetrics const & fm =
                theFontMetrics(font);
@@ -60,7 +58,7 @@ void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
        // Draw it as a box with the LaTeX text
-       FontInfo font = inherit_font_ ? pi.base.font : sane_font;
+       FontInfo font = sane_font;
        font.setColor(Color_command);
        font.decSize();
 

diff --git a/src/insets/RenderButton.h b/src/insets/RenderButton.h
index 480effd16ace2ae931325c8a7bcc79ba202952da..5e6ad35a087374886b51b1a3a67e735bab66dc67 100644 (file)
--- a/src/insets/RenderButton.h
+++ b/src/insets/RenderButton.h
@@ -33,7 +33,7 @@ public:
        virtual void draw(PainterInfo & pi, int x, int y) const;
 
        /// Provide the text for the button
-       void update(docstring const &, bool editable, bool inherit_font);
+       void update(docstring const &, bool editable);
 
        /// The "sensitive area" box, i.e., the button area
        Box box() const { return button_box_; }
@@ -47,7 +47,6 @@ private:
        /// The stored data.
        docstring text_;
        bool editable_;
-       bool inherit_font_;
        Box button_box_;
 };
 

diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index 344c570323a32aef7156509539c2574617d242b0..0c9e585e1a7a976893db08d832889aba627b0c8b 100644 (file)
--- a/src/mathed/CommandInset.cpp
+++ b/src/mathed/CommandInset.cpp
@@ -40,7 +40,7 @@ void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (!set_label_) {
                set_label_ = true;
-               button_.update(screenLabel(), true, false);
+               button_.update(screenLabel(), true);
        }
        button_.metrics(mi, dim);
 }