1. simon_linden
  2. viewer-rabbit


Andrew Dyukov  committed 5035532

EXT-8536 FIXED Fixed wrong behaviour of slidercontrol's lineeditor revert on escape.

Though bug description mentioned only appearance, bug reproduced for all slidercontrols. The cause of returning on escape to old value
instead of last commited one was that on commit slidercontrol set text for it's lineeditor which was the same as the one currently typed
into lineeditor(and it seems logical). But LLLineEditor::setText() has check at it's beginning which compares text which is being set to the
one which is already there. If this check succeeds, we exit the method and thus saving of value for revert is not reached. That's why when revert happened
on escape older value then the last commited was set in lineeditor.

- Added additional call of setText() in sliderctrl to force changes in currently set text so that on next call with "real" text saving of reverted value was reached.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/856/

  • Participants
  • Parent commits a5d4a28
  • Branches product-engine

Comments (0)

Files changed (1)

File indra/llui/llsliderctrl.cpp

View file
 		std::string text = llformat(format.c_str(), displayed_value);
 		if( mEditor )
+			// Setting editor text here to "" before using actual text is here because if text which
+			// is set is the same as the one which is actually typed into lineeditor, LLLineEditor::setText()
+			// will exit at it's beginning, so text for revert on escape won't be saved. (EXT-8536)
+			mEditor->setText( LLStringUtil::null );
 			mEditor->setText( text );