Make sure after EGET_EDITBOX_ENTER and EGET_COMBO_BOX_CHANGED event processing...

Make sure after EGET_EDITBOX_ENTER and EGET_COMBO_BOX_CHANGED event processing no more code is executed for the corresponding editbox or combobox objects to allow clearing the environment on those actions (see comments on bug-id 2995838).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4239 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CGUIComboBox.cpp

@@ -258,7 +258,10 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
 					setSelected((s32)Items.size() -1);
 
 				if (Selected != oldSelected)
+				{
 					sendSelectionChangedEvent();
+					return true;
+				}
 
 				if (absorb)
 					return true;
@@ -341,7 +344,10 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
 						setSelected((s32)Items.size() -1);
 
 					if (Selected != oldSelected)
+					{
 						sendSelectionChangedEvent();
+						return true;
+					}
 				}
 			default:
 				break;

source/Irrlicht/CGUIEditBox.cpp

@@ -462,13 +462,13 @@ bool CGUIEditBox::processKey(const SEvent& event)
 		if (MultiLine)
 		{
 			inputChar(L'\n');
-			return true;
 		}
 		else
 		{
+			calculateScrollPos();
 			sendGuiEvent( EGET_EDITBOX_ENTER );
 		}
-		break;
+		return true;
 	case KEY_LEFT:
 
 		if (event.KeyInput.Shift)
@@ -694,10 +694,13 @@ bool CGUIEditBox::processKey(const SEvent& event)
 	if (textChanged)
 	{
 		breakText();
+		calculateScrollPos();
 		sendGuiEvent(EGET_EDITBOX_CHANGED);
 	}
-
-	calculateScrollPos();
+	else
+	{
+		calculateScrollPos();
+	}
 
 	return true;
 }
@@ -1323,8 +1326,8 @@ void CGUIEditBox::inputChar(wchar_t c)
 		}
 	}
 	breakText();
-	sendGuiEvent(EGET_EDITBOX_CHANGED);
 	calculateScrollPos();
+	sendGuiEvent(EGET_EDITBOX_CHANGED);
 }
 
 // calculate autoscroll