[Scummvm-git-logs] scummvm master -> 0e574c6aabb184416e1d238567629a57a7246504

[npjg]

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:
0b8e37b53b DIRECTOR: Fix bitmap offset that wasn't changed before
0e574c6aab GRAPHICS: MACGUI: MacWidget: Clear composeSurface with background colour


Commit: 0b8e37b53b6d9a5c91f621d95a273518a805496c
    https://github.com/scummvm/scummvm/commit/0b8e37b53b6d9a5c91f621d95a273518a805496c
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-15T12:04:45-04:00

Commit Message:
DIRECTOR: Fix bitmap offset that wasn't changed before

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 6f11e1b9cc..6e10e451e4 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -141,7 +141,7 @@ void BitmapCast::createWidget() {
 		return;
 	}
 
-	_widget = new Graphics::MacWidget(g_director->getCurrentScore()->_window, 0, 0, _initialRect.width() - 1, _initialRect.height(), false);
+	_widget = new Graphics::MacWidget(g_director->getCurrentScore()->_window, 0, 0, _initialRect.width(), _initialRect.height(), false);
 	_widget->getSurface()->blitFrom(*_img->getSurface());
 }
 


Commit: 0e574c6aabb184416e1d238567629a57a7246504
    https://github.com/scummvm/scummvm/commit/0e574c6aabb184416e1d238567629a57a7246504
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-15T12:04:45-04:00

Commit Message:
GRAPHICS: MACGUI: MacWidget: Clear composeSurface with background colour

Changed paths:
    graphics/macgui/macwidget.cpp


diff --git a/graphics/macgui/macwidget.cpp b/graphics/macgui/macwidget.cpp
index b9769761f9..831ba828dc 100644
--- a/graphics/macgui/macwidget.cpp
+++ b/graphics/macgui/macwidget.cpp
@@ -37,6 +37,9 @@ MacWidget::MacWidget(MacWidget *parent, int x, int y, int w, int h, bool focusab
 	_dims.top = y;
 	_dims.bottom = y + h + (2 * border) + gutter + shadow;
 
+	_fgcolor = 0xff;
+	_bgcolor = 0;
+
 	if (parent)
 		parent->_children.push_back(this);
 
@@ -44,16 +47,13 @@ MacWidget::MacWidget(MacWidget *parent, int x, int y, int w, int h, bool focusab
 	_maskSurface = nullptr;
 
 	_composeSurface = new ManagedSurface(_dims.width(), _dims.height());
-	_composeSurface->clear(255);
+	_composeSurface->clear(_bgcolor);
 
 	_maskSurface = new ManagedSurface(_dims.width(), _dims.height());
-	_maskSurface->clear(0);
+	_maskSurface->clear(1);
 
 	_active = false;
 	_editable = false;
-
-	_fgcolor = 0xff;
-	_bgcolor = 0;
 }
 
 MacWidget::~MacWidget() {