ColorCode background,
FontState emph,
FontState underbar,
+ FontState strikeout,
+ FontState uuline,
+ FontState uwave,
FontState noun,
- FontState number
- ): family_(family), series_(series), shape_(shape), size_(size),
- color_(color), background_(background), emph_(emph),
- underbar_(underbar), noun_(noun), number_(number)
+ FontState number)
+ : family_(family), series_(series), shape_(shape), size_(size),
+ color_(color), background_(background), paint_color_(), emph_(emph),
+ underbar_(underbar), strikeout_(strikeout), uuline_(uuline),
+ uwave_(uwave), noun_(noun), number_(number)
{}
/// Decreases font size by one
void setEmph(FontState e) { emph_ = e; }
FontState underbar() const { return underbar_; }
void setUnderbar(FontState u) { underbar_ = u; }
+ FontState strikeout() const { return strikeout_; }
+ void setStrikeout(FontState s) { strikeout_ = s; }
+ FontState uuline() const { return uuline_; }
+ void setUuline(FontState s) { uuline_ = s; }
+ FontState uwave() const { return uwave_; }
+ void setUwave(FontState s) { uwave_ = s; }
FontState noun() const { return noun_; }
void setNoun(FontState n) { noun_ = n; }
FontState number() const { return number_; }
void setColor(ColorCode c) { color_ = c; }
ColorCode background() const { return background_; }
void setBackground(ColorCode b) { background_ = b; }
- Color drawColor() const { return draw_color_; }
- void setDrawColor(Color c) { draw_color_ = c; }
///@}
///
/// Is a given font fully resolved?
bool resolved() const;
- ///
+ /// The real color of the font. This can be the color that is
+ /// set for painting, the color of the font or a default color.
Color realColor() const;
+ /// Sets the color which is used during painting
+ void setPaintColor(Color c) { paint_color_ = c; }
/// Converts logical attributes to concrete shape attribute
/// Try hard to inline this as it shows up with 4.6 % in the profiler.
ColorCode color_;
///
ColorCode background_;
- ///
- Color draw_color_;
+ /// The color used for painting
+ Color paint_color_;
///
FontState emph_;
///
FontState underbar_;
///
+ FontState strikeout_;
+ ///
+ FontState uuline_;
+ ///
+ FontState uwave_;
+ ///
FontState noun_;
///
FontState number_;
&& lhs.background_ == rhs.background_
&& lhs.emph_ == rhs.emph_
&& lhs.underbar_ == rhs.underbar_
+ && lhs.strikeout_ == rhs.strikeout_
+ && lhs.uuline_ == rhs.uuline_
+ && lhs.uwave_ == rhs.uwave_
&& lhs.noun_ == rhs.noun_
&& lhs.number_ == rhs.number_;
}