[Scummvm-git-logs] scummvm master -> f8fc43be99aae36110b22f2016c9d62f1df2bd28
dreammaster
dreammaster at scummvm.org
Sat Sep 3 22:36:15 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:
f8fc43be99 SHERLOCK: RT: Fix hang clicking on edge of inventory verb list borders
Commit: f8fc43be99aae36110b22f2016c9d62f1df2bd28
https://github.com/scummvm/scummvm/commit/f8fc43be99aae36110b22f2016c9d62f1df2bd28
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-03T16:36:03-04:00
Commit Message:
SHERLOCK: RT: Fix hang clicking on edge of inventory verb list borders
Changed paths:
engines/sherlock/tattoo/widget_inventory.cpp
diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 9f126cf..c0b3180 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -377,14 +377,14 @@ void WidgetInventoryVerbs::handleEvents() {
innerBounds.grow(-3);
// Flag is they started pressing outside of the menu
- if (events._firstPress && !_bounds.contains(mousePos))
+ if (events._firstPress && !innerBounds.contains(mousePos))
_outsideMenu = true;
if (events._released || events._rightReleased || ui._keyState.keycode == Common::KEYCODE_ESCAPE) {
ui._scrollHighlight = SH_NONE;
banishWindow();
- if ((_outsideMenu && !innerBounds.contains(mousePos)) || ui._keyState.keycode == Common::KEYCODE_ESCAPE) {
+ if (_outsideMenu || ui._keyState.keycode == Common::KEYCODE_ESCAPE) {
_owner->_invVerbMode = 0;
} else if (innerBounds.contains(mousePos)) {
_outsideMenu = false;
More information about the Scummvm-git-logs
mailing list