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

sev- sev at scummvm.org
Fri Aug 18 19:07:16 CEST 2017


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:
bedbe39087 GRAPHICS: MACGUI: Fix MacTextWindow dragging and resizing


Commit: bedbe39087531a4ee5d1a9a58e63b7f200426172
    https://github.com/scummvm/scummvm/commit/bedbe39087531a4ee5d1a9a58e63b7f200426172
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-18T19:04:37+02:00

Commit Message:
GRAPHICS: MACGUI: Fix MacTextWindow dragging and resizing

Changed paths:
    graphics/macgui/mactextwindow.cpp
    graphics/macgui/macwindow.cpp


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 9bbf2c8..85a07b9 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -306,6 +306,9 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 		}
 	}
 
+	if (hasAllFocus())
+		return MacWindow::processEvent(event);	// Pass it to upstream
+
 	if (click == kBorderScrollUp || click == kBorderScrollDown) {
 		if (event.type == Common::EVENT_LBUTTONDOWN) {
 			int consoleHeight = getInnerDimensions().height();
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index 227f789..7b9afa4 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -459,7 +459,9 @@ bool MacWindow::processEvent(Common::Event &event) {
 			_draggedY = event.mouse.y;
 
 			_wm->setFullRefresh(true);
-			(*_callback)(click, event, _dataPtr);
+
+			if (_callback)
+				(*_callback)(click, event, _dataPtr);
 		}
 		break;
 	case Common::EVENT_LBUTTONDOWN:





More information about the Scummvm-git-logs mailing list