[Scummvm-cvs-logs] scummvm master -> 20a067a66266ab63270b65994a8ab35ff398c7d2

dreammaster dreammaster at scummvm.org
Mon Jul 27 02:59:51 CEST 2015


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:
20a067a662 SHERLOCK: RT: Fix scrolling talk window


Commit: 20a067a66266ab63270b65994a8ab35ff398c7d2
    https://github.com/scummvm/scummvm/commit/20a067a66266ab63270b65994a8ab35ff398c7d2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T20:58:26-04:00

Commit Message:
SHERLOCK: RT: Fix scrolling talk window

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



diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp
index bc2f833..d33da65 100644
--- a/engines/sherlock/tattoo/widget_talk.cpp
+++ b/engines/sherlock/tattoo/widget_talk.cpp
@@ -128,7 +128,7 @@ void WidgetTalk::handleEvents() {
 
 	// Only redraw the window if the the scrollbar position has changed
 	if (ui._scrollHighlight != oldHighlight || oldScrollIndex != _talkScrollIndex)
-		render(HL_SCROLLBAR_ONLY);
+		render(HL_NO_HIGHLIGHTING);
 
 	// Flag if they started pressing outside of the window
 	if (events._firstPress && !_bounds.contains(mousePos))
@@ -385,6 +385,9 @@ void WidgetTalk::render(Highlight highlightMode) {
 		for (uint idx = _talkScrollIndex; idx < _statementLines.size() && yp < (_bounds.height() - _surface.fontHeight()); ++idx) {
 			if (highlightMode == HL_NO_HIGHLIGHTING || _statementLines[idx]._num == _selector ||
 					_statementLines[idx]._num == _oldSelector) {
+				// Erase the line contents
+				_surface.fillRect(Common::Rect(3, yp, _surface.w() - BUTTON_SIZE - 3, yp + _surface.fontHeight()), TRANSPARENCY);
+
 				// Different coloring based on whether the option has been previously chosen or not
 				color = (!talk._talkHistory[talk._converseNum][_statementLines[idx]._num]) ?
 					INFO_TOP : INFO_BOTTOM;






More information about the Scummvm-git-logs mailing list