Jürgen Spitzmüller wrote:
> Better patch attached.
This is the final one. It sets the screen font of listings to foreground (i.e.
black).
Jürgen
Index: src/insets/InsetListings.h
===================================================================
--- src/insets/InsetListings.h (revision 18408)
+++ src/insets/InsetListings.h (working copy)
@@ -47,6 +47,10 @@
///
void validate(LaTeXFeatures &) const;
///
+ bool metrics(MetricsInfo &, Dimension &) const;
+ ///
+ void draw(PainterInfo & pi, int x, int y) const;
+ ///
bool showInsetDialog(BufferView *) const;
///
void getDrawFont(Font &) const;
Index: src/insets/InsetListings.cpp
===================================================================
--- src/insets/InsetListings.cpp (revision 18408)
+++ src/insets/InsetListings.cpp (working copy)
@@ -19,6 +19,7 @@
#include "DispatchResult.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "MetricsInfo.h"
#include "Cursor.h"
#include "support/lstrings.h"
@@ -42,14 +43,10 @@
Font font(Font::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(Color::foreground);
+ font.setColor(Color::none);
setLabelFont(font);
- // FIXME: english_language?
- text_.current_font.setLanguage(english_language);
- text_.real_current_font.setLanguage(english_language);
- // FIXME: why I can not make text of source code black with the following two lines?
- text_.current_font.setColor(Color::foreground);
- text_.real_current_font.setColor(Color::foreground);
+ text_.current_font.setLanguage(latex_language);
+ text_.real_current_font.setLanguage(latex_language);
}
@@ -119,7 +116,7 @@
break;
}
}
- InsetCollapsable::read(buf, lex);
+ InsetERT::read(buf, lex);
}
@@ -239,6 +236,29 @@
}
+bool InsetListings::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ Font tmpfont = mi.base.font;
+ getDrawFont(mi.base.font);
+ mi.base.font.realize(tmpfont);
+ InsetCollapsable::metrics(mi, dim);
+ mi.base.font = tmpfont;
+ bool const changed = dim_ != dim;
+ dim_ = dim;
+ return changed;
+}
+
+
+void InsetListings::draw(PainterInfo & pi, int x, int y) const
+{
+ Font tmpfont = pi.base.font;
+ getDrawFont(pi.base.font);
+ pi.base.font.realize(tmpfont);
+ InsetCollapsable::draw(pi, x, y);
+ pi.base.font = tmpfont;
+}
+
+
void InsetListings::validate(LaTeXFeatures & features) const
{
features.require("listings");
@@ -255,7 +275,7 @@
void InsetListings::getDrawFont(Font & font) const
{
- font = Font(Font::ALL_INHERIT, english_language);
+ font = Font(Font::ALL_INHERIT, latex_language);
font.setFamily(Font::TYPEWRITER_FAMILY);
font.setColor(Color::foreground);
}
