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

Consistent order of style property updates.

Browse Source 
See #4 (which is mostly fixed by this commit)
This commit is contained in:
Twan van Laarhoven
2020-05-10 00:20:37 +02:00
parent 420c329bc4
commit 1c35183839
8 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field.cpp
+10 -10
View File
@@ -139,16 +139,16 @@ inline bool is_setw(const Scriptable<double>& x) {
}
int Style::update(Context& ctx) {
int changed =
( left .update(ctx)
| width .update(ctx)
| right .update(ctx)
| top .update(ctx)
| height .update(ctx)
| bottom .update(ctx)
| angle .update(ctx) ) * CHANGE_SIZE
| visible.update(ctx) * CHANGE_OTHER
| mask .update(ctx) * CHANGE_MASK;
int changed = 0;
changed |= left .update(ctx) * CHANGE_SIZE;
changed |= width .update(ctx) * CHANGE_SIZE;
changed |= right .update(ctx) * CHANGE_SIZE;
changed |= top .update(ctx) * CHANGE_SIZE;
changed |= height .update(ctx) * CHANGE_SIZE;
changed |= bottom .update(ctx) * CHANGE_SIZE;
changed |= angle .update(ctx) * CHANGE_SIZE;
changed |= visible.update(ctx) * CHANGE_OTHER;
changed |= mask .update(ctx) * CHANGE_MASK;
// determine automatic_side and attachment of rotation point
if (automatic_side == AUTO_UNKNOWN) {
if (!is_set (right)) automatic_side = (AutomaticSide)(automatic_side | AUTO_RIGHT);
src/data/field/choice.cpp
+4 -4
View File
@@ -199,19 +199,19 @@ void ChoiceStyle::initImage() {
int ChoiceStyle::update(Context& ctx) {
// Don't update the choice images, leave that to invalidate()
int change = Style::update(ctx)
| font .update(ctx) * CHANGE_OTHER;
int changes = Style::update(ctx);
changes |= font.update(ctx) * CHANGE_OTHER;
if (!choice_images_initialized) {
// we only want to do this once because it is rather slow, other updates are handled by dependencies
choice_images_initialized = true;
FOR_EACH(ci, choice_images) {
if (ci.second.update(ctx)) {
change |= CHANGE_OTHER;
changes |= CHANGE_OTHER;
// TODO : remove this thumbnail
}
}
}
return change;
return changes;
}
void ChoiceStyle::initDependencies(Context& ctx, const Dependency& dep) const {
Style::initDependencies(ctx, dep);
src/data/field/image.cpp
+3 -2
View File
@@ -27,8 +27,9 @@ IMPLEMENT_REFLECTION(ImageStyle) {
}
int ImageStyle::update(Context& ctx) {
return Style ::update(ctx)
| default_image.update(ctx) * CHANGE_DEFAULT;
int changes = Style::update(ctx);
changes |= default_image.update(ctx) * CHANGE_DEFAULT;
return changes;
}
// ----------------------------------------------------------------------------- : ImageValue
src/data/field/information.cpp
+3 -2
View File
@@ -38,8 +38,9 @@ InfoStyle::InfoStyle(const InfoFieldP& field)
{}
int InfoStyle::update(Context& ctx) {
return Style ::update(ctx)
| font .update(ctx) * CHANGE_OTHER;
int changes = Style::update(ctx);
changes |= font.update(ctx) * CHANGE_OTHER;
return changes;
}
void InfoStyle::initDependencies(Context& ctx, const Dependency& dep) const {
Style ::initDependencies(ctx, dep);
src/data/field/multiple_choice.cpp
+4 -3
View File
@@ -40,9 +40,10 @@ IMPLEMENT_REFLECTION(MultipleChoiceStyle) {
}
int MultipleChoiceStyle::update(Context& ctx) {
return ChoiceStyle::update(ctx)
| direction.update(ctx) * CHANGE_OTHER
| spacing.update(ctx) * CHANGE_OTHER;
int changes = ChoiceStyle::update(ctx);
changes |= direction.update(ctx) * CHANGE_OTHER;
changes |= spacing.update(ctx) * CHANGE_OTHER;
return changes;
}
// ----------------------------------------------------------------------------- : MultipleChoiceValue
src/data/field/package_choice.cpp
+3 -2
View File
@@ -35,8 +35,9 @@ PackageChoiceStyle::PackageChoiceStyle(const PackageChoiceFieldP& field)
{}
int PackageChoiceStyle::update(Context& ctx) {
return Style ::update(ctx)
| font .update(ctx) * CHANGE_OTHER;
int changes = Style::update(ctx);
changes |= font.update(ctx) * CHANGE_OTHER;
return changes;
}
/*void PackageChoiceStyle::initDependencies(Context& ctx, const Dependency& dep) const {
Style ::initDependencies(ctx, dep);
src/data/field/text.cpp
+19 -19
View File
@@ -67,25 +67,25 @@ double TextStyle::getStretch() const {
}
int TextStyle::update(Context& ctx) {
return Style ::update(ctx)
| font .update(ctx) * CHANGE_OTHER
| symbol_font.update(ctx) * CHANGE_OTHER
| alignment .update(ctx) * CHANGE_OTHER
| ( padding_left .update(ctx)
| padding_left_min .update(ctx)
| padding_right .update(ctx)
| padding_right_min .update(ctx)
| padding_top .update(ctx)
| padding_top_min .update(ctx)
| padding_bottom .update(ctx)
| padding_bottom_min .update(ctx)
| line_height_soft .update(ctx)
| line_height_hard .update(ctx)
| line_height_line .update(ctx)
| line_height_soft_max.update(ctx)
| line_height_hard_max.update(ctx)
| line_height_line_max.update(ctx)
) * CHANGE_OTHER;
int changes = Style::update(ctx);
changes |= font .update(ctx) * CHANGE_OTHER;
changes |= symbol_font.update(ctx) * CHANGE_OTHER;
changes |= alignment .update(ctx) * CHANGE_OTHER;
changes |= padding_left .update(ctx) * CHANGE_OTHER;
changes |= padding_left_min .update(ctx) * CHANGE_OTHER;
changes |= padding_right .update(ctx) * CHANGE_OTHER;
changes |= padding_right_min .update(ctx) * CHANGE_OTHER;
changes |= padding_top .update(ctx) * CHANGE_OTHER;
changes |= padding_top_min .update(ctx) * CHANGE_OTHER;
changes |= padding_bottom .update(ctx) * CHANGE_OTHER;
changes |= padding_bottom_min .update(ctx) * CHANGE_OTHER;
changes |= line_height_soft .update(ctx) * CHANGE_OTHER;
changes |= line_height_hard .update(ctx) * CHANGE_OTHER;
changes |= line_height_line .update(ctx) * CHANGE_OTHER;
changes |= line_height_soft_max.update(ctx) * CHANGE_OTHER;
changes |= line_height_hard_max.update(ctx) * CHANGE_OTHER;
changes |= line_height_line_max.update(ctx) * CHANGE_OTHER;
return changes;
}
void TextStyle::initDependencies(Context& ctx, const Dependency& dep) const {
Style ::initDependencies(ctx, dep);
src/data/font.cpp
+9 -9
View File
@@ -25,15 +25,15 @@ Font::Font()
{}
bool Font::update(Context& ctx) {
bool changes
= name .update(ctx)
| italic_name .update(ctx)
| size .update(ctx)
| weight .update(ctx)
| style .update(ctx)
| underline .update(ctx)
| color .update(ctx)
| shadow_color.update(ctx);
bool changes = false;
changes |= name .update(ctx);
changes |= italic_name .update(ctx);
changes |= size .update(ctx);
changes |= weight .update(ctx);
changes |= style .update(ctx);
changes |= underline .update(ctx);
changes |= color .update(ctx);
changes |= shadow_color.update(ctx);
flags = (flags & ~FONT_BOLD & ~FONT_ITALIC)
| (weight() == _("bold") ? FONT_BOLD : FONT_NORMAL)
| (style() == _("italic") ? FONT_ITALIC : FONT_NORMAL);