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/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);