remove the "cancel on escape" behavior

mikke89 · Jul 30, 2024 · c065ea6 · c065ea6
1 parent ad5b411
commit c065ea6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/Source/Core/Elements/WidgetDropDown.cpp b/Source/Core/Elements/WidgetDropDown.cpp
@@ -391,8 +391,6 @@ int WidgetDropDown::AddOption(const String& rml, const String& option_value, int
 
 	int result = AddOption(std::move(element), before);
 
-	value_last_selected = -1;
-
 	return result;
 }
 
@@ -418,8 +416,6 @@ int WidgetDropDown::AddOption(ElementPtr element, int before)
 		option_index = before;
 	}
 
-	value_last_selected = -1;
-
 	return option_index;
 }
 
@@ -429,17 +425,13 @@ void WidgetDropDown::RemoveOption(int index)
 	if (!element)
 		return;
 
-	value_last_selected = -1;
-
 	selection_element->RemoveChild(element);
 }
 
 void WidgetDropDown::ClearOptions()
 {
 	while (Element* element = selection_element->GetLastChild())
 		selection_element->RemoveChild(element);
-
-	value_last_selected = -1;
 }
 
 Element* WidgetDropDown::GetOption(int index)
@@ -468,7 +460,6 @@ void WidgetDropDown::OnChildAdd(Element* element)
 		SetSelection(element, true);
 
 	selection_dirty = true;
-	value_last_selected = -1;
 	box_layout_dirty = DropDownBoxLayoutType::Switch;
 }
 
@@ -483,7 +474,6 @@ void WidgetDropDown::OnChildRemove(Element* element)
 		SetSelection(nullptr);
 
 	selection_dirty = true;
-	value_last_selected = -1;
 	box_layout_dirty = DropDownBoxLayoutType::Switch;
 }
 
@@ -604,17 +594,6 @@ void WidgetDropDown::ProcessEvent(Event& event)
 			parent_element->Click();
 			event.StopPropagation();
 			break;
-		case Input::KI_ESCAPE:
-			if (!box_visible)
-				break;
-			if (value_last_selected != -1)
-			{
-				SetSelection(GetOption(value_last_selected), true);
-				value_last_selected = -1;
-			}
-			ShowSelectBox(false);
-			event.StopPropagation();
-			break;
 		default: break;
 		}
 	}
@@ -653,7 +632,6 @@ void WidgetDropDown::ShowSelectBox(bool show)
 		value_element->SetPseudoClass("checked", true);
 		button_element->SetPseudoClass("checked", true);
 		box_layout_dirty = DropDownBoxLayoutType::Open;
-		value_last_selected = GetSelection();
 		AttachScrollEvent();
 	}
 	else

diff --git a/Source/Core/Elements/WidgetDropDown.h b/Source/Core/Elements/WidgetDropDown.h
@@ -130,7 +130,6 @@ class WidgetDropDown : public EventListener {
 	bool value_layout_dirty;
 	DropDownBoxLayoutType box_layout_dirty;
 	bool box_visible;
-	int value_last_selected;
 };
 
 } // namespace Rml