luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected the "setlabel" command for edit-in-place cells, for which 

setlabel would report label properties correctly but would never
alter them.
This commit is contained in:
Tim Edwards 2017-12-14 20:21:05 -05:00
parent 4af736b18a
commit 6b41c3fa3e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commands/CmdRS.c
View File

@ -1478,7 +1478,7 @@ cmdLabelTextFunc(label, cellUse, transform, text)
TxPrintf("%s\n", label->lab_text); TxPrintf("%s\n", label->lab_text);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
if (strcmp(text, label->lab_text)) if (strcmp(text, label->lab_text))
{ {
@ -1515,7 +1515,7 @@ cmdLabelRotateFunc(label, cellUse, transform, value)
TxPrintf("%d\n", label->lab_rotate); TxPrintf("%d\n", label->lab_rotate);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
DBUndoEraseLabel(cellDef, label); DBUndoEraseLabel(cellDef, label);
DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS); DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS);
@ -1550,7 +1550,7 @@ cmdLabelSizeFunc(label, cellUse, transform, value)
TxPrintf("%g\n", (double)label->lab_size / 8.0); TxPrintf("%g\n", (double)label->lab_size / 8.0);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
DBUndoEraseLabel(cellDef, label); DBUndoEraseLabel(cellDef, label);
DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS); DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS);
@ -1585,7 +1585,7 @@ cmdLabelJustFunc(label, cellUse, transform, value)
TxPrintf("%s\n", GeoPosToName(label->lab_just)); TxPrintf("%s\n", GeoPosToName(label->lab_just));
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
DBUndoEraseLabel(cellDef, label); DBUndoEraseLabel(cellDef, label);
DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS); DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS);
@ -1621,7 +1621,7 @@ cmdLabelLayerFunc(label, cellUse, transform, value)
TxPrintf("%s\n", DBTypeLongNameTbl[label->lab_type]); TxPrintf("%s\n", DBTypeLongNameTbl[label->lab_type]);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
ttype = (TileType)(*value); ttype = (TileType)(*value);
if (label->lab_type != ttype) if (label->lab_type != ttype)
@ -1659,7 +1659,7 @@ cmdLabelStickyFunc(label, cellUse, transform, value)
TxPrintf("%s\n", (label->lab_flags & LABEL_STICKY) ? "true" : "false"); TxPrintf("%s\n", (label->lab_flags & LABEL_STICKY) ? "true" : "false");
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
newvalue = label->lab_flags; newvalue = label->lab_flags;
newvalue &= ~LABEL_STICKY; newvalue &= ~LABEL_STICKY;
@ -1703,7 +1703,7 @@ cmdLabelOffsetFunc(label, cellUse, transform, point)
(double)(label->lab_offset.p_y) / 8.0); (double)(label->lab_offset.p_y) / 8.0);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
DBUndoEraseLabel(cellDef, label); DBUndoEraseLabel(cellDef, label);
DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS); DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS);
@ -1744,7 +1744,7 @@ cmdLabelFontFunc(label, cellUse, transform, font)
TxPrintf("%s\n", DBFontList[label->lab_font]->mf_name); TxPrintf("%s\n", DBFontList[label->lab_font]->mf_name);
#endif #endif
} }
else if (cellDef == EditRootDef) else
{ {
DBUndoEraseLabel(cellDef, label); DBUndoEraseLabel(cellDef, label);
DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS); DBWLabelChanged(cellDef, label, DBW_ALLWINDOWS);