Allow SELECTED for single edits
We like to allow items that are marked SELECTED to remain so during editing but this does not indicate that there are multiple edits queued, so do not prevent pushing this into the undo queue.
This commit is contained in:
parent
7372acdaa5
commit
adb89afe6c
|
@ -322,13 +322,13 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataFromWindow()
|
||||||
|
|
||||||
// If no other command in progress, prepare undo command
|
// If no other command in progress, prepare undo command
|
||||||
// (for a command in progress, will be made later, at the completion of command)
|
// (for a command in progress, will be made later, at the completion of command)
|
||||||
bool pushCommit = ( m_item->GetFlags() == 0 );
|
bool pushCommit = !( m_item->GetFlags() & ~SELECTED );
|
||||||
|
|
||||||
/* set flag in edit to force undo/redo/abort proper operation,
|
/* set flag in edit to force undo/redo/abort proper operation,
|
||||||
* and avoid new calls to SaveCopyInUndoList for the same text
|
* and avoid new calls to SaveCopyInUndoList for the same text
|
||||||
* this can occurs when a text is moved, and then rotated, edited ..
|
* this can occurs when a text is moved, and then rotated, edited ..
|
||||||
*/
|
*/
|
||||||
if( m_item->GetFlags() != 0 )
|
if( !pushCommit )
|
||||||
m_item->SetFlags( IN_EDIT );
|
m_item->SetFlags( IN_EDIT );
|
||||||
|
|
||||||
#ifndef USE_WX_OVERLAY
|
#ifndef USE_WX_OVERLAY
|
||||||
|
|
Loading…
Reference in New Issue