[Scummvm-cvs-logs] scummvm master -> f3f9a57d2a6a5a8efeb4f3881a688cd263ae0f45

sev- sev at scummvm.org
Thu Apr 21 17:53:42 CEST 2016


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:
f3f9a57d2a WAGE: Make sure we're reporting only actually processed by the callback events


Commit: f3f9a57d2a6a5a8efeb4f3881a688cd263ae0f45
    https://github.com/scummvm/scummvm/commit/f3f9a57d2a6a5a8efeb4f3881a688cd263ae0f45
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-21T17:53:24+02:00

Commit Message:
WAGE: Make sure we're reporting only actually processed by the callback events

Changed paths:
    engines/wage/gui.cpp



diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 7e703b1..2446be9 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -369,6 +369,8 @@ bool Gui::processConsoleEvents(WindowClick click, Common::Event &event) {
 			float scrollSize = (float)_consoleTextArea.height() / textFullSize;
 
 			_consoleWindow->setScroll(scrollPos, scrollSize);
+
+			return true;
 		} else if (event.type == Common::EVENT_LBUTTONUP) {
 			int oldScrollPos = _scrollPos;
 
@@ -388,16 +390,20 @@ bool Gui::processConsoleEvents(WindowClick click, Common::Event &event) {
 				_consoleFullRedraw = true;
 				break;
 			default:
-				break;
+				return false;
 			}
+
+			return true;
 		}
 
-		return true;
+		return false;
 	}
 
 	if (click == kBorderInner) {
 		if (event.type == Common::EVENT_LBUTTONDOWN) {
 			startMarking(event.mouse.x, event.mouse.y);
+
+			return true;
 		} else if (event.type == Common::EVENT_LBUTTONUP) {
 			if (_inTextSelection) {
 				_inTextSelection = false;
@@ -419,6 +425,8 @@ bool Gui::processConsoleEvents(WindowClick click, Common::Event &event) {
 					_menu->enableCommand(kMenuEdit, kMenuActionClear, cutAllowed);
 				}
 			}
+
+			return true;
 		} else if (event.type == Common::EVENT_MOUSEMOVE) {
 			if (_inTextSelection) {
 				updateTextSelection(event.mouse.x, event.mouse.y);
@@ -431,7 +439,7 @@ bool Gui::processConsoleEvents(WindowClick click, Common::Event &event) {
 			}
 		}
 
-		return true;
+		return false;
 	}
 
 	return false;






More information about the Scummvm-git-logs mailing list