[Scummvm-git-logs] scummvm master -> 8c52f6db120f54f2366a9768b69e110d3a7767c5

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
233e0e21a8 DIRECTOR: Draw video only when it is truly changed
8c52f6db12 GRAPHICS: MACGUI: Reset MacWindget dirty flag on blit.


Commit: 233e0e21a8ba94e88d8862848790609a93ef2994
    https://github.com/scummvm/scummvm/commit/233e0e21a8ba94e88d8862848790609a93ef2994
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-24T20:53:37+02:00

Commit Message:
DIRECTOR: Draw video only when it is truly changed

Changed paths:
    engines/director/channel.cpp
    engines/director/score.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 98890905d8..744613b0bc 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -248,8 +248,6 @@ bool Channel::isActiveVideo() {
 	if (!_sprite->_cast || _sprite->_cast->_type != kCastDigitalVideo)
 		return false;
 
-	// TODO: Check that the video is not paused
-
 	return true;
 }
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f000849ccc..589dc77627 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -502,7 +502,7 @@ void Score::renderSprites(uint16 frameId, RenderMode mode) {
 		if (channel->isActiveVideo())
 			_movie->_videoPlayback = true;
 
-		if (channel->isDirty(nextSprite) || channel->isActiveVideo() || widgetRedrawn || mode == kRenderForceUpdate) {
+		if (channel->isDirty(nextSprite) || widgetRedrawn || mode == kRenderForceUpdate) {
 			if (!currentSprite->_trails)
 				_window->addDirtyRect(channel->getBbox());
 


Commit: 8c52f6db120f54f2366a9768b69e110d3a7767c5
    https://github.com/scummvm/scummvm/commit/8c52f6db120f54f2366a9768b69e110d3a7767c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-24T20:53:37+02:00

Commit Message:
GRAPHICS: MACGUI: Reset MacWindget dirty flag on blit.

This reduces amount of unnecessary redraws.

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/macwidget.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index de3ab9819c..cb4d39a6db 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -858,6 +858,9 @@ void MacText::draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int
 
 	if (x + w < _surface->w || y + h < _surface->h)
 		g->fillRect(Common::Rect(x, y, x + w, y + w), _bgcolor);
+
+	_contentIsDirty = false;
+	_cursorDirty = false;
 }
 
 bool MacText::draw(bool forceRedraw) {
diff --git a/graphics/macgui/macwidget.cpp b/graphics/macgui/macwidget.cpp
index f2256762bd..cdc6a39322 100644
--- a/graphics/macgui/macwidget.cpp
+++ b/graphics/macgui/macwidget.cpp
@@ -74,10 +74,14 @@ void MacWidget::setActive(bool active) {
 }
 
 bool MacWidget::draw(bool forceRedraw) {
+	_contentIsDirty = false;
+
 	return false;
 }
 
 bool MacWidget::draw(ManagedSurface *g, bool forceRedraw) {
+	_contentIsDirty = false;
+
 	return false;
 }