mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-23 00:11:49 +00:00
6c33aa2e5b
=================================================================== --- src/mathed/InsetMathHull.cpp (revisione 34304) +++ src/mathed/InsetMathHull.cpp (copia locale) @@ -328,6 +328,23 @@ docstring InsetMathHull::standardFont() } +docstring InsetMathHull::standardColor() const +{ + docstring color; + switch (type_) { + case hullRegexp: + color = from_ascii("foreground"); + break; + case hullNone: + color = from_ascii("foreground"); + break; + default: + color = from_ascii("math"); + } + return color; +} + + bool InsetMathHull::previewState(BufferView * bv) const { if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) { @@ -417,8 +434,11 @@ void InsetMathHull::draw(PainterInfo & p return; } + bool const really_change_color = pi.base.font.color() == Color_none; + ColorChanger dummy0(pi.base.font, standardColor(), really_change_color); FontSetChanger dummy1(pi.base, standardFont()); StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT); + InsetMathGrid::draw(pi, x + 1, y); if (numberedType()) { Index: src/mathed/MathSupport.cpp =================================================================== --- src/mathed/MathSupport.cpp (revisione 34311) +++ src/mathed/MathSupport.cpp (copia locale) @@ -653,6 +653,13 @@ bool isMathFont(docstring const & name) } +bool isTextFont(docstring const & name) +{ + fontinfo * f = lookupFont(name); + return f && f->color_ == Color_foreground; +} + + FontInfo getFont(docstring const & name) { FontInfo font; Index: src/mathed/MathSupport.h =================================================================== --- src/mathed/MathSupport.h (revisione 34311) +++ src/mathed/MathSupport.h (copia locale) @@ -51,6 +51,8 @@ bool isFontName(docstring const & name); bool isMathFont(docstring const & name); +bool isTextFont(docstring const & name); + // converts single cell to string docstring asString(MathData const & ar); // converts single inset to string Index: src/mathed/InsetMathHull.h =================================================================== --- src/mathed/InsetMathHull.h (revisione 34304) +++ src/mathed/InsetMathHull.h (copia locale) @@ -197,6 +197,8 @@ private: void changeCols(col_type); /// docstring standardFont() const; + /// + docstring standardColor() const; /// consistency check void check() const; /// can this change its number of rows? Index: src/MetricsInfo.cpp =================================================================== --- src/MetricsInfo.cpp (revisione 34312) +++ src/MetricsInfo.cpp (copia locale) @@ -235,11 +235,15 @@ FontSetChanger::FontSetChanger(MetricsBa save_ = mb; FontSize oldsize = save_.font.size(); ColorCode oldcolor = save_.font.color(); + docstring const oldname = from_ascii(save_.fontname); mb.fontname = name; mb.font = sane_font; augmentFont(mb.font, from_ascii(name)); mb.font.setSize(oldsize); - mb.font.setColor(oldcolor); + if (string(name) != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); } } @@ -252,11 +256,15 @@ FontSetChanger::FontSetChanger(MetricsBa save_ = mb; FontSize oldsize = save_.font.size(); ColorCode oldcolor = save_.font.color(); + docstring const oldname = from_ascii(save_.fontname); mb.fontname = to_utf8(name); mb.font = sane_font; augmentFont(mb.font, name); mb.font.setSize(oldsize); - mb.font.setColor(oldcolor); + if (name != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); } } @@ -294,17 +302,21 @@ WidthChanger::~WidthChanger() // ///////////////////////////////////////////////////////////////////////// -ColorChanger::ColorChanger(FontInfo & font, string const & color) - : Changer<FontInfo, string>(font) +ColorChanger::ColorChanger(FontInfo & font, docstring const & color, + bool really_change_color) + : Changer<FontInfo, ColorCode>(font), change_(really_change_color) { - save_ = lcolor.getFromLyXName(color); - font.setColor(lcolor.getFromLyXName(color)); + if (change_) { + save_ = font.color(); + font.setColor(lcolor.getFromLyXName(to_utf8(color))); + } } ColorChanger::~ColorChanger() { - orig_.setColor(lcolor.getFromLyXName(save_)); + if (change_) + orig_.setColor(save_); } Index: src/MetricsInfo.h =================================================================== --- src/MetricsInfo.h (revisione 34312) +++ src/MetricsInfo.h (copia locale) @@ -222,12 +222,16 @@ public: // temporarily change the used color -class ColorChanger : public Changer<FontInfo, std::string> { +class ColorChanger : public Changer<FontInfo, ColorCode> { public: /// - ColorChanger(FontInfo & font, std::string const & color); + ColorChanger(FontInfo & font, docstring const & color, + bool really_change_color = true); /// ~ColorChanger(); +private: + /// + bool change_; }; } // namespace lyx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34320 a592a061-630c-0410-9148-cb99ea01b6c8
240 lines
4.6 KiB
C++
240 lines
4.6 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file MetricsInfo.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author André Pönitz
|
|
* \author Stefan Schimanski
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef METRICSINFO_H
|
|
#define METRICSINFO_H
|
|
|
|
#include "Changes.h"
|
|
#include "ColorCode.h"
|
|
#include "FontInfo.h"
|
|
|
|
#include "support/strfwd.h"
|
|
#include "support/types.h"
|
|
|
|
#include <string>
|
|
|
|
class BufferView;
|
|
|
|
namespace lyx {
|
|
|
|
namespace frontend { class Painter; }
|
|
class Inset;
|
|
class MacroContext;
|
|
|
|
|
|
/// Standard Sizes (mode styles)
|
|
enum Styles {
|
|
///
|
|
LM_ST_DISPLAY = 0,
|
|
///
|
|
LM_ST_TEXT,
|
|
///
|
|
LM_ST_SCRIPT,
|
|
///
|
|
LM_ST_SCRIPTSCRIPT
|
|
};
|
|
|
|
|
|
//
|
|
// This is the part common to MetricsInfo and PainterInfo
|
|
//
|
|
class MetricsBase {
|
|
public:
|
|
///
|
|
MetricsBase();
|
|
///
|
|
MetricsBase(BufferView * bv, FontInfo const & font, int textwidth);
|
|
|
|
/// the current view
|
|
BufferView * bv;
|
|
/// current font
|
|
FontInfo font;
|
|
/// current math style (display/text/script/..)
|
|
Styles style;
|
|
/// name of current font - mathed specific
|
|
std::string fontname;
|
|
/// This is the width available in pixels
|
|
int textwidth;
|
|
};
|
|
|
|
|
|
//
|
|
// This contains a MetricsBase and information that's only relevant during
|
|
// the first phase of the two-phase draw
|
|
//
|
|
class MetricsInfo {
|
|
public:
|
|
///
|
|
MetricsInfo();
|
|
///
|
|
MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
|
|
|
|
///
|
|
MetricsBase base;
|
|
/// The context to resolve macros
|
|
MacroContext const & macrocontext;
|
|
};
|
|
|
|
|
|
//
|
|
// This contains a MetricsBase and information that's only relevant during
|
|
// the second phase of the two-phase draw
|
|
//
|
|
class PainterInfo {
|
|
public:
|
|
///
|
|
PainterInfo(BufferView * bv, frontend::Painter & pain);
|
|
///
|
|
void draw(int x, int y, char_type c);
|
|
///
|
|
void draw(int x, int y, docstring const & str);
|
|
/// Determines the background color for the specified inset based on the
|
|
/// selection state, the background color inherited from the parent inset
|
|
/// and the inset's own background color.
|
|
/// \param sel whether to take the selection state into account
|
|
ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
|
|
|
|
///
|
|
MetricsBase base;
|
|
///
|
|
frontend::Painter & pain;
|
|
/// Whether the text at this point is right-to-left (for InsetNewline)
|
|
bool ltr_pos;
|
|
/// The change the parent is part of (change tracking)
|
|
Change change_;
|
|
/// Whether the parent is selected as a whole
|
|
bool selected;
|
|
///
|
|
bool full_repaint;
|
|
/// Current background color
|
|
ColorCode background_color;
|
|
};
|
|
|
|
class TextMetricsInfo {};
|
|
|
|
|
|
/// Generic base for temporarily changing things.
|
|
/// The original state gets restored when the Changer is destructed.
|
|
template <class Struct, class Temp = Struct>
|
|
class Changer {
|
|
public:
|
|
///
|
|
Changer(Struct & orig) : orig_(orig) {}
|
|
protected:
|
|
///
|
|
Struct & orig_;
|
|
///
|
|
Temp save_;
|
|
};
|
|
|
|
|
|
|
|
// temporarily change some aspect of a font
|
|
class FontChanger : public Changer<FontInfo> {
|
|
public:
|
|
///
|
|
FontChanger(FontInfo & orig, docstring const & font);
|
|
FontChanger(MetricsBase & mb, char const * const font);
|
|
///
|
|
~FontChanger();
|
|
};
|
|
|
|
|
|
// temporarily change a full font
|
|
class FontSetChanger : public Changer<MetricsBase> {
|
|
public:
|
|
///
|
|
FontSetChanger(MetricsBase & mb, docstring const & font,
|
|
bool really_change_font = true);
|
|
FontSetChanger(MetricsBase & mb, char const * const font,
|
|
bool really_change_font = true);
|
|
///
|
|
~FontSetChanger();
|
|
private:
|
|
///
|
|
bool change_;
|
|
};
|
|
|
|
|
|
// temporarily change the style
|
|
class StyleChanger : public Changer<MetricsBase> {
|
|
public:
|
|
///
|
|
StyleChanger(MetricsBase & mb, Styles style);
|
|
///
|
|
~StyleChanger();
|
|
};
|
|
|
|
|
|
// temporarily change the style to script style
|
|
class ScriptChanger : public StyleChanger {
|
|
public:
|
|
///
|
|
ScriptChanger(MetricsBase & mb);
|
|
};
|
|
|
|
|
|
// temporarily change the style suitable for use in fractions
|
|
class FracChanger : public StyleChanger {
|
|
public:
|
|
///
|
|
FracChanger(MetricsBase & mb);
|
|
};
|
|
|
|
|
|
// temporarily change the style suitable for use in tabulars and arrays
|
|
class ArrayChanger : public StyleChanger {
|
|
public:
|
|
///
|
|
ArrayChanger(MetricsBase & mb);
|
|
};
|
|
|
|
|
|
|
|
// temporarily change the shape of a font
|
|
class ShapeChanger : public Changer<FontInfo, FontShape> {
|
|
public:
|
|
///
|
|
ShapeChanger(FontInfo & font, FontShape shape);
|
|
///
|
|
~ShapeChanger();
|
|
};
|
|
|
|
|
|
// temporarily change the available text width
|
|
class WidthChanger : public Changer<MetricsBase>
|
|
{
|
|
public:
|
|
///
|
|
WidthChanger(MetricsBase & mb, int width);
|
|
///
|
|
~WidthChanger();
|
|
};
|
|
|
|
|
|
// temporarily change the used color
|
|
class ColorChanger : public Changer<FontInfo, ColorCode> {
|
|
public:
|
|
///
|
|
ColorChanger(FontInfo & font, docstring const & color,
|
|
bool really_change_color = true);
|
|
///
|
|
~ColorChanger();
|
|
private:
|
|
///
|
|
bool change_;
|
|
};
|
|
|
|
} // namespace lyx
|
|
|
|
#endif
|