[Scummvm-cvs-logs] scummvm master -> 18406818ebcf0aa40f9c881742d366931f16fb1a

[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:
18406818eb SHERLOCK: RT: Fix map tooltip display when map is scrolled


Commit: 18406818ebcf0aa40f9c881742d366931f16fb1a
    https://github.com/scummvm/scummvm/commit/18406818ebcf0aa40f9c881742d366931f16fb1a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-15T07:41:54-04:00

Commit Message:
SHERLOCK: RT: Fix map tooltip display when map is scrolled

Changed paths:
    engines/sherlock/tattoo/widget_base.cpp



diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp
index 905dd31..9b8569c 100644
--- a/engines/sherlock/tattoo/widget_base.cpp
+++ b/engines/sherlock/tattoo/widget_base.cpp
@@ -147,10 +147,10 @@ void WidgetBase::restrictToScreen() {
 		_bounds.moveTo(screen._currentScroll.x, _bounds.top);
 	if (_bounds.top < 0)
 		_bounds.moveTo(_bounds.left, 0);
-	if (_bounds.right > SHERLOCK_SCENE_WIDTH)
-		_bounds.moveTo(SHERLOCK_SCENE_WIDTH - _bounds.width(), _bounds.top);
-	if (_bounds.bottom > SHERLOCK_SCREEN_HEIGHT)
-		_bounds.moveTo(_bounds.left, SHERLOCK_SCREEN_HEIGHT - _bounds.height());
+	if (_bounds.right > screen._backBuffer1.w())
+		_bounds.moveTo(screen._backBuffer1.w() - _bounds.width(), _bounds.top);
+	if (_bounds.bottom > screen._backBuffer1.h())
+		_bounds.moveTo(_bounds.left, screen._backBuffer1.h() - _bounds.height());
 }
 
 void WidgetBase::makeInfoArea(Surface &s) {