Replace many event string comparisons with EventId

Samples/basic/animation/src/main.cpp

@@ -206,7 +206,9 @@ public:
 		if(value == "exit")
 			Shell::RequestExit();
 
-		if (event == "keydown")
+		switch (event.GetId())
+		{
+		case EventId::Keydown:
 		{
 			Rocket::Core::Input::KeyIdentifier key_identifier = (Rocket::Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
 
@@ -257,7 +259,9 @@ public:
 				if (el) el->Animate("left", Property{ 0.f, Property::PX }, 0.5, Tween{ Tween::Cubic });
 			}
 		}
-		if (event == "click")
+		break;
+
+		case EventId::Click:
 		{
 			auto el = event.GetTargetElement();
 			if (el->GetId() == "transition_class")
@@ -265,7 +269,9 @@ public:
 				el->SetClass("move_me", !el->IsClassSet("move_me"));
 			}
 		}
-		if (event == "animationend")
+		break;
+
+		case EventId::Animationend:
 		{
 			auto el = event.GetTargetElement();
 			if (el->GetId() == "animation_event")
@@ -274,6 +280,11 @@ public:
 				el->Animate("left", Property(Math::RandomReal(100.f), Property::PERCENT), 0.8f, Tween{ Tween::Cubic, Tween::InOut });
 			}
 		}
+		break;
+
+		default:
+			break;
+		}
 	}
 
 	void OnDetach(Rocket::Core::Element* element) override { delete this; }

Samples/basic/drag/src/DragListener.cpp

@@ -38,7 +38,7 @@ void DragListener::RegisterDraggableContainer(Rocket::Core::Element* element)
 
 void DragListener::ProcessEvent(Rocket::Core::Event& event)
 {
-	if (event == "dragdrop")
+	if (event == Rocket::Core::EventId::Dragdrop)
 	{
 		Rocket::Core::Element* dest_container = event.GetCurrentElement();
 		Rocket::Core::Element* dest_element = event.GetTargetElement();

Samples/invaders/src/ElementGame.cpp

@@ -45,10 +45,10 @@ ElementGame::~ElementGame()
 // Intercepts and handles key events.
 void ElementGame::ProcessEvent(Rocket::Core::Event& event)
 {
-	if (event == "keydown" ||
-		event == "keyup")
+	if (event == Rocket::Core::EventId::Keydown ||
+		event == Rocket::Core::EventId::Keyup)
 	{
-		bool key_down = event == "keydown";
+		bool key_down = (event == Rocket::Core::EventId::Keydown);
 		Rocket::Core::Input::KeyIdentifier key_identifier = (Rocket::Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
 
 		if (key_identifier == Rocket::Core::Input::KI_ESCAPE &&
@@ -76,7 +76,7 @@ void ElementGame::ProcessEvent(Rocket::Core::Event& event)
 		}
 	}
 
-	if (event == "load")
+	if (event == Rocket::Core::EventId::Load)
 	{
 		game->Initialise();
 	}

Samples/luainvaders/src/ElementGame.cpp

@@ -45,10 +45,10 @@ ElementGame::~ElementGame()
 // Intercepts and handles key events.
 void ElementGame::ProcessEvent(Rocket::Core::Event& event)
 {
-	if (event == "keydown" ||
-		event == "keyup")
+	if (event == Rocket::Core::EventId::Keydown ||
+		event == Rocket::Core::EventId::Keyup)
 	{
-		bool key_down = event == "keydown";
+		bool key_down = (event == Rocket::Core::EventId::Keydown);
 		Rocket::Core::Input::KeyIdentifier key_identifier = (Rocket::Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);		
 
 		// Process left and right keys
@@ -70,7 +70,7 @@ void ElementGame::ProcessEvent(Rocket::Core::Event& event)
 		}
 	}
 
-	if (event == "load")
+	if (event == Rocket::Core::EventId::Load)
 	{
 		game->Initialise();
 	}

Source/Controls/ElementDataGridExpandButton.cpp

@@ -44,7 +44,7 @@ void ElementDataGridExpandButton::ProcessDefaultAction(Core::Event& event)
 {
 	Core::Element::ProcessDefaultAction(event);
 
-	if (event == "click" && event.GetCurrentElement() == this)
+	if (event == Core::EventId::Click && event.GetCurrentElement() == this)
 	{
 		// Look for the first data grid row above us, and toggle their on/off
 		// state.

Source/Controls/ElementTabSet.cpp

@@ -144,7 +144,7 @@ int ElementTabSet::GetActiveTab() const
 // Process the incoming event.
 void ElementTabSet::ProcessEvent(Core::Event& event)
 {
-	if (event.GetCurrentElement() == this && event == "click")
+	if (event.GetCurrentElement() == this && event == Core::EventId::Click)
 	{
 		// Find the tab that this click occured on
 		Core::Element* tabs = GetChildByTag("tabs");

Source/Controls/InputTypeButton.cpp

@@ -60,7 +60,7 @@ void InputTypeButton::ProcessDefaultAction(Core::Event& event)
 	// Stop a click event from proceeding any further if this button is disabled.
 	if (event.GetTargetElement() == element &&
 		element->IsDisabled() &&
-		(event == "click" || event == "dblclick"))
+		(event == Core::EventId::Click || event == Core::EventId::Dblclick))
 	{
 		event.StopPropagation();
 	}

Source/Controls/InputTypeCheckbox.cpp

@@ -65,7 +65,7 @@ bool InputTypeCheckbox::OnAttributeChange(const Core::AttributeNameList& changed
 // Checks for necessary functional changes in the control as a result of the event.
 void InputTypeCheckbox::ProcessDefaultAction(Core::Event& event)
 {
-	if (event == "click" &&
+	if (event == Core::EventId::Click &&
 		!element->IsDisabled())
 	{
 		if (element->HasAttribute("checked"))

Source/Controls/InputTypeSubmit.cpp

@@ -49,7 +49,7 @@ bool InputTypeSubmit::IsSubmitted()
 // Checks for necessary functional changes in the control as a result of the event.
 void InputTypeSubmit::ProcessDefaultAction(Core::Event& event)
 {
-	if (event == "click" &&
+	if (event == Core::EventId::Click &&
 		!element->IsDisabled())
 	{
 		Core::Element* parent = element->GetParentNode();

Source/Controls/WidgetDropDown.cpp

@@ -296,7 +296,9 @@ void WidgetDropDown::ProcessEvent(Core::Event& event)
 		return;
 
 	// Process the button onclick
-	if (event == "click")
+	switch (event.GetId())
+	{
+	case Core::EventId::Click:
 	{
 
 		if (event.GetCurrentElement()->GetParentNode() == selection_element)
@@ -335,43 +337,47 @@ void WidgetDropDown::ProcessEvent(Core::Event& event)
 				ShowSelectBox(true);
 			else
 				ShowSelectBox(false);
-		}		
-	}
-	else if (event == "blur" && event.GetTargetElement() == parent_element)
-	{
-		ShowSelectBox(false);
-	}
-	else if (event == "keydown")
-	{
-		Core::Input::KeyIdentifier key_identifier = (Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
-
-		switch (key_identifier)
-		{
-			case Core::Input::KI_UP:
-				SetSelection((selected_option - 1 + (int)options.size()) % (int)options.size());
-				break;
-			case Core::Input::KI_DOWN:		
-				SetSelection((selected_option + 1) % (int)options.size());
-				break;
-			default:
-				break;
 		}
 	}
-
-	if (event.GetTargetElement() == parent_element)
+	break;
+	case Core::EventId::Focus:
 	{
-		if (event == "focus")
+		if (event.GetTargetElement() == parent_element)
 		{
 			value_element->SetPseudoClass("focus", true);
 			button_element->SetPseudoClass("focus", true);
 		}
-		else if (event == "blur")
+	}
+	case Core::EventId::Blur:
+	{
+		if (event.GetTargetElement() == parent_element)
 		{
+			ShowSelectBox(false);
 			value_element->SetPseudoClass("focus", false);
 			button_element->SetPseudoClass("focus", false);
 		}
 	}
+	break;
+	case Core::EventId::Keydown:
+	{
+		Core::Input::KeyIdentifier key_identifier = (Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
 
+		switch (key_identifier)
+		{
+		case Core::Input::KI_UP:
+			SetSelection((selected_option - 1 + (int)options.size()) % (int)options.size());
+			break;
+		case Core::Input::KI_DOWN:
+			SetSelection((selected_option + 1) % (int)options.size());
+			break;
+		default:
+			break;
+		}
+	}
+	break;
+	default:
+		break;
+	}
 }
 
 // Shows or hides the selection box.

Source/Controls/WidgetSlider.cpp

@@ -387,9 +387,13 @@ void WidgetSlider::ProcessEvent(Core::Event& event)
 	if (parent->IsDisabled())
 		return;
 
-	if (event == "mousedown")
+	using Rocket::Core::EventId;
+
+	switch (event.GetId())
+	{
+	case EventId::Mousedown:
 	{
-		if(event.GetTargetElement() == parent || event.GetTargetElement() == track) 
+		if (event.GetTargetElement() == parent || event.GetTargetElement() == track)
 		{
 			if (orientation == HORIZONTAL)
 			{
@@ -406,23 +410,47 @@ void WidgetSlider::ProcessEvent(Core::Event& event)
 				SetBarPosition(click_position <= bar_position ? OnPageDecrement(click_position) : OnPageIncrement(click_position));
 			}
 		}
+		else if (event.GetTargetElement() == arrows[0])
+		{
+			arrow_timers[0] = DEFAULT_REPEAT_DELAY;
+			last_update_time = Core::Clock::GetElapsedTime();
+			SetBarPosition(OnLineDecrement());
+		}
+		else if (event.GetTargetElement() == arrows[1])
+		{
+			arrow_timers[1] = DEFAULT_REPEAT_DELAY;
+			last_update_time = Core::Clock::GetElapsedTime();
+			SetBarPosition(OnLineIncrement());
+		}
+	}
+	break;
+
+	case EventId::Mouseup:
+	case EventId::Mouseout:
+	{
+		if (event.GetTargetElement() == arrows[0])
+			arrow_timers[0] = -1;
+		else if (event.GetTargetElement() == arrows[1])
+			arrow_timers[1] = -1;
 	}
+	break;
 
-	if (event.GetTargetElement() == parent)
+	case EventId::Dragstart:
 	{
-		if (event == "dragstart")
+		if (event.GetTargetElement() == parent)
 		{
 			bar->SetPseudoClass("active", true);
-		}
-		else if (event == "dragend")
-		{
-			bar->SetPseudoClass("active", false);
+
+			if (orientation == HORIZONTAL)
+				bar_drag_anchor = event.GetParameter< int >("mouse_x", 0) - Rocket::Core::Math::RealToInteger(bar->GetAbsoluteOffset().x);
+			else
+				bar_drag_anchor = event.GetParameter< int >("mouse_y", 0) - Rocket::Core::Math::RealToInteger(bar->GetAbsoluteOffset().y);
 		}
 	}
-
-	if (event.GetTargetElement() == parent)
+	break;
+	case EventId::Drag:
 	{
-		if (event == "drag")
+		if (event.GetTargetElement() == parent)
 		{
 			if (orientation == HORIZONTAL)
 			{
@@ -449,72 +477,57 @@ void WidgetSlider::ProcessEvent(Core::Event& event)
 				}
 			}
 		}
-		else if (event == "dragstart")
-		{
-			if (orientation == HORIZONTAL)
-				bar_drag_anchor = event.GetParameter< int >("mouse_x", 0) - Rocket::Core::Math::RealToInteger(bar->GetAbsoluteOffset().x);
-			else
-				bar_drag_anchor = event.GetParameter< int >("mouse_y", 0) - Rocket::Core::Math::RealToInteger(bar->GetAbsoluteOffset().y);
-		}
 	}
-
-	if (event == "mousedown")
+	break;
+	case EventId::Dragend:
 	{
-		if (event.GetTargetElement() == arrows[0])
-		{
-			arrow_timers[0] = DEFAULT_REPEAT_DELAY;
-			last_update_time = Core::Clock::GetElapsedTime();
-			SetBarPosition(OnLineDecrement());
-		}
-		else if (event.GetTargetElement() == arrows[1])
+		if (event.GetTargetElement() == parent)
 		{
-			arrow_timers[1] = DEFAULT_REPEAT_DELAY;
-			last_update_time = Core::Clock::GetElapsedTime();
-			SetBarPosition(OnLineIncrement());
+			bar->SetPseudoClass("active", false);
 		}
 	}
-	else if (event == "mouseup" ||
-			 event == "mouseout")
-	{
-		if (event.GetTargetElement() == arrows[0])
-			arrow_timers[0] = -1;
-		else if (event.GetTargetElement() == arrows[1])
-			arrow_timers[1] = -1;
-	}
-	else if (event == "keydown")
+	break;
+
+
+	case EventId::Keydown:
 	{
 		Core::Input::KeyIdentifier key_identifier = (Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
 
 		switch (key_identifier)
 		{
-			case Core::Input::KI_LEFT:
-				if (orientation == HORIZONTAL) SetBarPosition(OnLineDecrement());
-				break;
-			case Core::Input::KI_UP:
-				if (orientation == VERTICAL) SetBarPosition(OnLineDecrement());
-				break;
-			case Core::Input::KI_RIGHT:
-				if (orientation == HORIZONTAL) SetBarPosition(OnLineIncrement());
-				break;
-			case Core::Input::KI_DOWN:		
-				if (orientation == VERTICAL) SetBarPosition(OnLineIncrement());
-				break;
-			default:
-				break;
+		case Core::Input::KI_LEFT:
+			if (orientation == HORIZONTAL) SetBarPosition(OnLineDecrement());
+			break;
+		case Core::Input::KI_UP:
+			if (orientation == VERTICAL) SetBarPosition(OnLineDecrement());
+			break;
+		case Core::Input::KI_RIGHT:
+			if (orientation == HORIZONTAL) SetBarPosition(OnLineIncrement());
+			break;
+		case Core::Input::KI_DOWN:
+			if (orientation == VERTICAL) SetBarPosition(OnLineIncrement());
+			break;
+		default:
+			break;
 		}
 	}
+	break;
 
-
-	if (event.GetTargetElement() == parent)
+	case EventId::Focus:
 	{
-		if (event == "focus")
-		{
+		if (event.GetTargetElement() == parent)
 			bar->SetPseudoClass("focus", true);
-		}
-		else if (event == "blur")
-		{
+	}
+	break;
+	case EventId::Blur:
+	{
+		if (event.GetTargetElement() == parent)
 			bar->SetPseudoClass("focus", false);
-		}
+	}
+	break;
+
+	default:
+		break;
 	}
 }
 

Source/Controls/WidgetTextInput.cpp

@@ -266,115 +266,120 @@ void WidgetTextInput::DispatchChangeEvent(bool linebreak)
 void WidgetTextInput::ProcessEvent(Core::Event& event)
 {
 	if (parent->IsDisabled())
-	{
 		return;
-	}
-	else if (event == "keydown")
+
+	using Rocket::Core::EventId;
+
+	switch (event.GetId())
+	{
+	case EventId::Keydown:
 	{
 		Core::Input::KeyIdentifier key_identifier = (Core::Input::KeyIdentifier) event.GetParameter< int >("key_identifier", 0);
 		bool numlock = event.GetParameter< int >("num_lock_key", 0) > 0;
 		bool shift = event.GetParameter< int >("shift_key", 0) > 0;
-        bool ctrl = event.GetParameter< int >("ctrl_key", 0) > 0;
+		bool ctrl = event.GetParameter< int >("ctrl_key", 0) > 0;
 
 		switch (key_identifier)
 		{
-			case Core::Input::KI_NUMPAD4:	if (numlock) break;
-			case Core::Input::KI_LEFT:		MoveCursorHorizontal(-1, shift); break;
+		case Core::Input::KI_NUMPAD4:	if (numlock) break;
+		case Core::Input::KI_LEFT:		MoveCursorHorizontal(-1, shift); break;
 
-			case Core::Input::KI_NUMPAD6:	if (numlock) break;
-			case Core::Input::KI_RIGHT:		MoveCursorHorizontal(1, shift); break;
+		case Core::Input::KI_NUMPAD6:	if (numlock) break;
+		case Core::Input::KI_RIGHT:		MoveCursorHorizontal(1, shift); break;
 
-			case Core::Input::KI_NUMPAD8:	if (numlock) break;
-			case Core::Input::KI_UP:		MoveCursorVertical(-1, shift); break;
+		case Core::Input::KI_NUMPAD8:	if (numlock) break;
+		case Core::Input::KI_UP:		MoveCursorVertical(-1, shift); break;
 
-			case Core::Input::KI_NUMPAD2:	if (numlock) break;
-			case Core::Input::KI_DOWN:		MoveCursorVertical(1, shift); break;
+		case Core::Input::KI_NUMPAD2:	if (numlock) break;
+		case Core::Input::KI_DOWN:		MoveCursorVertical(1, shift); break;
 
-			case Core::Input::KI_NUMPAD7:	if (numlock) break;
-			case Core::Input::KI_HOME:		MoveCursorHorizontal(-cursor_character_index, shift); break;
+		case Core::Input::KI_NUMPAD7:	if (numlock) break;
+		case Core::Input::KI_HOME:		MoveCursorHorizontal(-cursor_character_index, shift); break;
 
-			case Core::Input::KI_NUMPAD1:	if (numlock) break;
-			case Core::Input::KI_END:		MoveCursorHorizontal(lines[cursor_line_index].content_length - cursor_character_index, shift); break;
+		case Core::Input::KI_NUMPAD1:	if (numlock) break;
+		case Core::Input::KI_END:		MoveCursorHorizontal(lines[cursor_line_index].content_length - cursor_character_index, shift); break;
 
-			case Core::Input::KI_BACK:
+		case Core::Input::KI_BACK:
+		{
+			if (DeleteCharacter(true))
 			{
-				if (DeleteCharacter(true))
-				{
-					FormatElement();
-					UpdateRelativeCursor();
-				}
-
-				ShowCursor(true);
+				FormatElement();
+				UpdateRelativeCursor();
 			}
-			break;
 
-			case Core::Input::KI_DECIMAL:	if (numlock) break;
-			case Core::Input::KI_DELETE:
-			{
-				if (DeleteCharacter(false))
-				{
-					FormatElement();
-					UpdateRelativeCursor();
-				}
-
-				ShowCursor(true);
-			}
-			break;
+			ShowCursor(true);
+		}
+		break;
 
-			case Core::Input::KI_NUMPADENTER:
-			case Core::Input::KI_RETURN:
+		case Core::Input::KI_DECIMAL:	if (numlock) break;
+		case Core::Input::KI_DELETE:
+		{
+			if (DeleteCharacter(false))
 			{
-				LineBreak();
+				FormatElement();
+				UpdateRelativeCursor();
 			}
-			break;
 
-			case Core::Input::KI_C:
-			{
-                if (ctrl)
-                    CopySelection();
-			}
-			break;
+			ShowCursor(true);
+		}
+		break;
 
-			case Core::Input::KI_X:
+		case Core::Input::KI_NUMPADENTER:
+		case Core::Input::KI_RETURN:
+		{
+			LineBreak();
+		}
+		break;
+
+		case Core::Input::KI_C:
+		{
+			if (ctrl)
+				CopySelection();
+		}
+		break;
+
+		case Core::Input::KI_X:
+		{
+			if (ctrl)
 			{
-                if (ctrl)
-                {
-                    CopySelection();
-                    DeleteSelection();
-                }
+				CopySelection();
+				DeleteSelection();
 			}
-			break;
+		}
+		break;
 
-			case Core::Input::KI_V:
+		case Core::Input::KI_V:
+		{
+			if (ctrl)
 			{
-                if (ctrl)
-                {
-    				const Core::WString clipboard_content = Clipboard::Get();
-    				for (size_t i = 0; i < clipboard_content.size(); ++i)
-    				{
-    					if (max_length > 0 &&
-    						(int) Core::ToWideString(GetElement()->GetAttribute< Rocket::Core::String >("value", "")).size() > max_length)
-    						break;
-
-    					AddCharacter(clipboard_content[i]);
-    				}
-                }
+				const Core::WString clipboard_content = Clipboard::Get();
+				for (size_t i = 0; i < clipboard_content.size(); ++i)
+				{
+					if (max_length > 0 &&
+						(int)Core::ToWideString(GetElement()->GetAttribute< Rocket::Core::String >("value", "")).size() > max_length)
+						break;
+
+					AddCharacter(clipboard_content[i]);
+				}
 			}
-			break;
+		}
+		break;
 
-			// Ignore tabs so input fields can be navigated through with keys.
-			case Core::Input::KI_TAB:
-				return;
+		// Ignore tabs so input fields can be navigated through with keys.
+		case Core::Input::KI_TAB:
+			return;
 
-			default:
-			{
-			}
-			break;
+		default:
+		{
+		}
+		break;
 		}
 
 		event.StopPropagation();
 	}
-	else if (event == "textinput")
+	break;
+
+	case EventId::Textinput:
 	{
 		// Only process the text if no modifier keys are pressed.
 		if (event.GetParameter< int >("ctrl_key", 0) == 0 &&
@@ -382,43 +387,58 @@ void WidgetTextInput::ProcessEvent(Core::Event& event)
 			event.GetParameter< int >("meta_key", 0) == 0)
 		{
 			Rocket::Core::word character = event.GetParameter< Rocket::Core::word >("data", 0);
-			if (max_length < 0 || (int) Core::String(GetElement()->GetAttribute< Rocket::Core::String >("value", "")).size() < max_length)
+			if (max_length < 0 || (int)Core::String(GetElement()->GetAttribute< Rocket::Core::String >("value", "")).size() < max_length)
 				AddCharacter(character);
 		}
 
 		ShowCursor(true);
 		event.StopPropagation();
 	}
-	else if (event == "focus" &&
-			 event.GetTargetElement() == parent)
+	break;
+	case EventId::Focus:
 	{
-		UpdateSelection(false);
-		ShowCursor(true, false);
+		if (event.GetTargetElement() == parent)
+		{
+			UpdateSelection(false);
+			ShowCursor(true, false);
+		}
 	}
-	else if (event == "blur" &&
-		     event.GetTargetElement() == parent)
+	break;
+	case EventId::Blur:
 	{
-		ClearSelection();
-		ShowCursor(false, false);
-	}	
-	else if ((event == "mousedown" ||
-			  event == "drag") &&
-			 event.GetTargetElement() == parent)
+		if (event.GetTargetElement() == parent)
+		{
+			ClearSelection();
+			ShowCursor(false, false);
+		}
+	}
+	break;
+	case EventId::Mousedown:
+	case EventId::Drag:
 	{
-		Core::Vector2f mouse_position = Core::Vector2f(event.GetParameter< float >("mouse_x", 0), event.GetParameter< float >("mouse_y", 0));
-		mouse_position -= text_element->GetAbsoluteOffset();
+		if (event.GetTargetElement() == parent)
+		{
+			Core::Vector2f mouse_position = Core::Vector2f(event.GetParameter< float >("mouse_x", 0), event.GetParameter< float >("mouse_y", 0));
+			mouse_position -= text_element->GetAbsoluteOffset();
 
-		cursor_line_index = CalculateLineIndex(mouse_position.y);
-		cursor_character_index = CalculateCharacterIndex(cursor_line_index, mouse_position.x);
+			cursor_line_index = CalculateLineIndex(mouse_position.y);
+			cursor_character_index = CalculateCharacterIndex(cursor_line_index, mouse_position.x);
 
-		UpdateAbsoluteCursor();
-		UpdateCursorPosition();
-		ideal_cursor_position = cursor_position.x;
+			UpdateAbsoluteCursor();
+			UpdateCursorPosition();
+			ideal_cursor_position = cursor_position.x;
 
-		UpdateSelection(event == "drag" || event.GetParameter< int >("shift_key", 0) > 0);
+			UpdateSelection(event == "drag" || event.GetParameter< int >("shift_key", 0) > 0);
 
-		ShowCursor(true);
+			ShowCursor(true);
+		}
 	}
+	break;
+
+	default:
+		break;
+	}
+
 }
 
 // Adds a new character to the string at the cursor position.

Source/Core/ElementDocument.cpp

@@ -410,7 +410,7 @@ void ElementDocument::ProcessDefaultAction(Event& event)
 	Element::ProcessDefaultAction(event);
 
 	// Process generic keyboard events for this window in bubble phase
-	if (event.GetPhase() == EventPhase::Bubble && event == KEYDOWN)
+	if (event.GetPhase() == EventPhase::Bubble && event == EventId::Keydown)
 	{
 		int key_identifier = event.GetParameter<int>("key_identifier", Input::KI_UNKNOWN);
 

Source/Core/ElementHandle.cpp

@@ -83,7 +83,7 @@ void ElementHandle::ProcessDefaultAction(Event& event)
 			initialised = true;
 		}
 
-		if (event == DRAGSTART)
+		if (event == EventId::Dragstart)
 		{
 			// Store the drag starting position
 			drag_start.x = event.GetParameter< int >("mouse_x", 0);
@@ -98,7 +98,7 @@ void ElementHandle::ProcessDefaultAction(Event& event)
 			if (size_target)
 				size_original_size = size_target->GetBox().GetSize(Box::CONTENT);
 		}
-		else if (event == DRAG)
+		else if (event == EventId::Drag)
 		{
 			// Work out the delta
 			int x = event.GetParameter< int >("mouse_x", 0) - drag_start.x;

Source/Core/ElementScroll.cpp

@@ -230,7 +230,7 @@ void ElementScroll::FormatScrollbars()
 // Handles the 'onchange' events for the scrollbars.
 void ElementScroll::ProcessEvent(Event& event)
 {
-	if (event == "scrollchange")
+	if (event == EventId::Scrollchange)
 	{
 		float value = event.GetParameter< float >("value", 0);
 

Source/Core/WidgetSlider.cpp

@@ -387,7 +387,7 @@ void WidgetSlider::ProcessEvent(Event& event)
 {
 	if (event.GetTargetElement() == bar)
 	{
-		if (event == DRAG)
+		if (event == EventId::Drag)
 		{
 			if (orientation == HORIZONTAL)
 			{
@@ -414,7 +414,7 @@ void WidgetSlider::ProcessEvent(Event& event)
 				}
 			}
 		}
-		else if (event == DRAGSTART)
+		else if (event == EventId::Dragstart)
 		{
 			if (orientation == HORIZONTAL)
 				bar_drag_anchor = event.GetParameter< int >("mouse_x", 0) - Math::RealToInteger(bar->GetAbsoluteOffset().x);
@@ -424,7 +424,7 @@ void WidgetSlider::ProcessEvent(Event& event)
 	}
 	else if (event.GetTargetElement() == track)
 	{
-		if (event == CLICK)
+		if (event == EventId::Click)
 		{
 			if (orientation == HORIZONTAL)
 			{
@@ -443,7 +443,7 @@ void WidgetSlider::ProcessEvent(Event& event)
 		}
 	}
 
-	if (event == MOUSEDOWN)
+	if (event == EventId::Mousedown)
 	{
 		if (event.GetTargetElement() == arrows[0])
 		{
@@ -458,8 +458,8 @@ void WidgetSlider::ProcessEvent(Event& event)
 			SetBarPosition(OnLineIncrement());
 		}
 	}
-	else if (event == MOUSEUP ||
-			 event == MOUSEOUT)
+	else if (event == EventId::Mouseup ||
+			 event == EventId::Mouseout)
 	{
 		if (event.GetTargetElement() == arrows[0])
 			arrow_timers[0] = -1;

Source/Debugger/ElementInfo.cpp

@@ -122,7 +122,7 @@ void ElementInfo::ProcessEvent(Core::Event& event)
 	// Only process events if we're visible
 	if (IsVisible())
 	{
-		if (event == "click")
+		if (event == Core::EventId::Click)
 		{
 			Core::Element* target_element = event.GetTargetElement();
 
@@ -177,7 +177,7 @@ void ElementInfo::ProcessEvent(Core::Event& event)
 				}
 			}
 		}
-		else if (event == "mouseover")
+		else if (event == Core::EventId::Mouseover)
 		{
 			Core::Element* target_element = event.GetTargetElement();
 

Source/Debugger/ElementLog.cpp

@@ -228,7 +228,7 @@ void ElementLog::ProcessEvent(Core::Event& event)
 	// Only process events if we're visible
 	if (beacon != NULL)
 	{
-		if (event == "click")
+		if (event == Core::EventId::Click)
 		{
 			if (event.GetTargetElement() == beacon->GetFirstChild())
 			{
@@ -261,7 +261,7 @@ void ElementLog::ProcessEvent(Core::Event& event)
 		}
 	}
 
-	if (event == "resize" && auto_scroll)
+	if (event == Core::EventId::Resize && auto_scroll)
 	{
 		if (message_content != NULL &&
 			message_content->HasChildNodes())

Source/Debugger/Plugin.cpp

@@ -256,7 +256,7 @@ void Plugin::OnElementDestroy(Core::Element* element)
 // Event handler for events from the debugger elements.
 void Plugin::ProcessEvent(Core::Event& event)
 {
-	if (event == "click")
+	if (event == Core::EventId::Click)
 	{
 		if (event.GetTargetElement()->GetId() == "event-log-button")
 		{