anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

Fixes bug #10682.

This reverts commit 555338048d.
This commit is contained in:
Jean-Marc Lasgouttes 2017-05-23 16:50:53 +02:00
parent 0516af0c99
commit 3f34ebbaf9
10 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/InsetBibtex.h
View File

@ -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; }

2
src/insets/InsetCitation.h
View File

@ -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);

3
src/insets/InsetCommand.cpp
View File

@ -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);
}

2
src/insets/InsetCommand.h
View File

@ -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
//@{

2
src/insets/InsetExternal.cpp
View File

@ -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;
}

4
src/insets/InsetInclude.cpp
View File

@ -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) {

4
src/insets/InsetRef.h
View File

@ -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; }

10
src/insets/RenderButton.cpp
View File

@ -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();

3
src/insets/RenderButton.h
View File

@ -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_;
};

2
src/mathed/CommandInset.cpp
View File

@ -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);
}