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