W_EDITBOX: Improve ending editing mode

Warzone2100 · Oct 11, 2023 · 5718147 · 5718147
1 parent 9d15ce1
commit 5718147
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/lib/widget/editbox.cpp b/lib/widget/editbox.cpp
@@ -450,6 +450,7 @@ void W_EDITBOX::run(W_CONTEXT *psContext)
 			{
 				lockedScreen->setFocus(nullptr);
 			}
+			stopEditing();
 			debug(LOG_INPUT, "EditBox cursor return");
 			return;
 			break;
@@ -467,12 +468,16 @@ void W_EDITBOX::run(W_CONTEXT *psContext)
 			else
 			{
 				// hitting ESC while the editbox is empty ends editing mode
-				StopTextInput(this);
 				if (auto lockedScreen = screenPointer.lock())
 				{
 					lockedScreen->setFocus(nullptr);
 				}
 				inputLoseFocus();	// clear the input buffer.
+				stopEditing();
+				if (onEscHandler)
+				{
+					onEscHandler(*this);
+				}
 				return;
 			}
 			break;
@@ -609,25 +614,43 @@ void W_EDITBOX::clicked(W_CONTEXT *psContext, WIDGET_KEY)
 }
 
 
-/* Respond to loss of focus */
-void W_EDITBOX::focusLost()
+void W_EDITBOX::stopEditing()
 {
-	ASSERT(!(state & WEDBS_DISABLE), "editBoxFocusLost: disabled edit box");
+	if (state & WEDBS_DISABLE)  // disabled button.
+	{
+		return;
+	}
+
+	/* Note the edit state */
+	unsigned editState = state & WEDBS_MASK;
+
+	/* Only have anything to do if the widget is being edited */
+	if ((editState & WEDBS_MASK) == WEDBS_FIXED)
+	{
+		return;
+	}
 
 	/* Stop editing the widget */
 	state = WEDBS_FIXED;
 	printStart = 0;
 	fitStringStart();
 	StopTextInput(this);
+	dirty = true;
+}
+
+/* Respond to loss of focus */
+void W_EDITBOX::focusLost()
+{
+	ASSERT(!(state & WEDBS_DISABLE), "editBoxFocusLost: disabled edit box");
+
+	stopEditing();
 
 	if (auto lockedScreen = screenPointer.lock())
 	{
 		lockedScreen->setReturn(shared_from_this());
 	}
-	dirty = true;
 }
 
-
 /* Respond to a mouse moving over an edit box */
 void W_EDITBOX::highlight(W_CONTEXT *)
 {
@@ -750,3 +773,8 @@ void W_EDITBOX::setOnReturnHandler(const OnReturnHandler& func)
 {
 	onRetHandler = func;
 }
+
+void W_EDITBOX::setOnEscapeHandler(const OnReturnHandler& func)
+{
+	onEscHandler = func;
+}
diff --git a/lib/widget/editbox.h b/lib/widget/editbox.h
@@ -59,6 +59,8 @@ class W_EDITBOX : public WIDGET
 	void display(int xOffset, int yOffset) override;
 	void geometryChanged() override;
 
+	void stopEditing();
+
 	void setState(unsigned state) override;
 	WzString getString() const override;
 	void setString(WzString string) override;
@@ -69,6 +71,7 @@ class W_EDITBOX : public WIDGET
 
 	typedef std::function<void (W_EDITBOX&)> OnReturnHandler;
 	void setOnReturnHandler(const OnReturnHandler& func);
+	void setOnEscapeHandler(const OnReturnHandler& func);
 
 	UDWORD		state;						// The current edit box state
 	WzString	aText;						// The text in the edit box
@@ -100,6 +103,7 @@ class W_EDITBOX : public WIDGET
 	EditBoxDisplayCache displayCache;
 	bool suppressAudioCallback = false;
 	OnReturnHandler	onRetHandler = nullptr;
+	OnReturnHandler onEscHandler = nullptr;
 };
 
 #endif // __INCLUDED_LIB_WIDGET_EDITBOX_H__