amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 21:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some problems where AColor was not used correctly; documentation of AColor.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@849 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-16 20:22:39 +00:00
parent fdb3bda26e
commit bcfa07a724
5 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/font.cpp
+2 -2
View File
@@ -20,7 +20,7 @@ Font::Font()
, color(AColor(0,0,0))
, shadow_displacement(0,0)
, shadow_blur(0)
, separator_color(128,128,128)
, separator_color(AColor(0,0,0,128))
, flags(FONT_NORMAL)
{}
@@ -50,7 +50,7 @@ void Font::initDependencies(Context& ctx, const Dependency& dep) const {
shadow_color.initDependencies(ctx, dep);
}
FontP Font::make(int add_flags, Color* other_color, double* other_size) const {
FontP Font::make(int add_flags, AColor* other_color, double* other_size) const {
FontP f(new Font(*this));
f->flags |= add_flags;
if (add_flags & FONT_CODE_STRING) {
src/data/font.hpp
+2 -2
View File
@@ -45,7 +45,7 @@ class Font : public IntrusivePtrBase<Font> {
Scriptable<AColor> shadow_color; ///< Color for shadow
RealSize shadow_displacement; ///< Position of the shadow
double shadow_blur; ///< Blur radius of the shadow
Color separator_color; ///< Color for <sep> text
AColor separator_color; ///< Color for <sep> text
int flags; ///< FontFlags for this font
Font();
@@ -61,7 +61,7 @@ class Font : public IntrusivePtrBase<Font> {
}
/// Add style to a font, and optionally change the color and size
FontP make(int add_flags, Color* other_color, double* other_size) const;
FontP make(int add_flags, AColor* other_color, double* other_size) const;
/// Convert this font to a wxFont
wxFont toWxFont(double scale) const;