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

Fixed mask for image fields, added mask support to slice window

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@243 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-03-29 18:27:05 +00:00
parent cb1c0a9afb
commit f025630b8b
7 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field/choice.cpp
+3 -2
View File
@@ -177,7 +177,8 @@ ChoiceStyle::~ChoiceStyle() {
bool ChoiceStyle::update(Context& ctx) {
// Don't update the choice images, leave that to invalidate()
return Style::update(ctx);
return Style ::update(ctx)
| mask_filename.update(ctx);
}
void ChoiceStyle::initDependencies(Context& ctx, const Dependency& dep) const {
Style::initDependencies(ctx, dep);
@@ -199,7 +200,7 @@ void ChoiceStyle::invalidate() {
}
void ChoiceStyle::loadMask(Package& pkg) {
if (mask.Ok() || mask_filename.empty()) return;
if (mask.Ok() || mask_filename().empty()) return;
// load file
InputStreamP image_file = pkg.openIn(mask_filename);
mask.LoadFile(*image_file);