[Scummvm-git-logs] scummvm master -> fd2762e8eeaab4fc9749195cd6abaeb2243ece93

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd2762e8ee CREATE_ENGINE: Split control focusing events from view open/close


Commit: fd2762e8eeaab4fc9749195cd6abaeb2243ece93
    https://github.com/scummvm/scummvm/commit/fd2762e8eeaab4fc9749195cd6abaeb2243ece93
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-07-23T19:02:06-07:00

Commit Message:
CREATE_ENGINE: Split control focusing events from view open/close

Changed paths:
    devtools/create_engine/files_events/events.h
    devtools/create_engine/files_events/messages.h
    devtools/create_engine/files_events/view.cpp


diff --git a/devtools/create_engine/files_events/events.h b/devtools/create_engine/files_events/events.h
index 84fa8068223..08d3a336280 100644
--- a/devtools/create_engine/files_events/events.h
+++ b/devtools/create_engine/files_events/events.h
@@ -234,6 +234,8 @@ public:
 
 	MESSAGE(Focus);
 	MESSAGE(Unfocus);
+	MESSAGE(MouseEnter);
+	MESSAGE(MouseLeave);
 	MESSAGE(Keypress);
 	MESSAGE(MouseDown);
 	MESSAGE(MouseUp);
@@ -275,6 +277,8 @@ protected:
 	MESSAGE(Action);
 	MESSAGE(Focus);
 	MESSAGE(Unfocus);
+	MESSAGE(MouseEnter);
+	MESSAGE(MouseLeave);
 	MESSAGE(Keypress);
 	MESSAGE(MouseDown);
 	MESSAGE(MouseUp);
diff --git a/devtools/create_engine/files_events/messages.h b/devtools/create_engine/files_events/messages.h
index 16b624c613f..f8f7ad6ae5f 100644
--- a/devtools/create_engine/files_events/messages.h
+++ b/devtools/create_engine/files_events/messages.h
@@ -40,6 +40,8 @@ struct FocusMessage : public Message {
 };
 
 struct UnfocusMessage : public Message {};
+struct MouseEnterMessage : public Message {};
+struct MouseLeaveMessage : public Message {};
 
 struct KeypressMessage : public Message, public Common::KeyState {
 	KeypressMessage() : Message() {}
diff --git a/devtools/create_engine/files_events/view.cpp b/devtools/create_engine/files_events/view.cpp
index db9423fa97b..8b2ea758f31 100644
--- a/devtools/create_engine/files_events/view.cpp
+++ b/devtools/create_engine/files_events/view.cpp
@@ -26,7 +26,7 @@ namespace Xyzzy {
 void View::checkFocusedControl(const Common::Point &mousePos) {
 	if (_focusedElement) {
 		if (!_focusedElement->getBounds().contains(mousePos)) {
-			_focusedElement->send(UnfocusMessage());
+			_focusedElement->send(MouseLeaveMessage());
 			_focusedElement = nullptr;
 		}
 
@@ -34,7 +34,7 @@ void View::checkFocusedControl(const Common::Point &mousePos) {
 		for (UIElement *child : _children) {
 			if (child->getBounds().contains(mousePos)) {
 				_focusedElement = child;
-				child->send(FocusMessage());
+				child->send(MouseEnterMessage());
 				break;
 			}
 		}
@@ -58,7 +58,7 @@ bool View::msgFocus(const FocusMessage &msg) {
 
 bool View::msgUnfocus(const UnfocusMessage &msg) {
 	if (_focusedElement)
-		_focusedElement->send(UnfocusMessage());
+		_focusedElement->send(MouseLeaveMessage());
 
 	return UIElement::msgUnfocus(msg);
 }