[Scummvm-git-logs] scummvm master -> 1e85ecf04814c805564e3fe8cbaf8e5126b43e49

[sev-]

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

Summary:
7ee172b47f SLUDGE: Fixing backdrop transparency. Now parallax works as expected
463031f88a GRAPHICS: MACGUI: Do not refresh full screen when cursor is away from menu
f6c7f99b3d GRAPHICS: MACGUI: Simplified background restoration code in MacMenu
1e85ecf048 GRAPHICS: MACGUI: Draw plain rectangle menu in Win95 mode


Commit: 7ee172b47f3ac58b96163d14cd7409cc8ae0dc04
    https://github.com/scummvm/scummvm/commit/7ee172b47f3ac58b96163d14cd7409cc8ae0dc04
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-14T18:49:02+02:00

Commit Message:
SLUDGE: Fixing backdrop transparency. Now parallax works as expected

Changed paths:
    engines/sludge/graphics.cpp


diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp
index 3ed9b8404e..f61304b5e7 100644
--- a/engines/sludge/graphics.cpp
+++ b/engines/sludge/graphics.cpp
@@ -77,7 +77,7 @@ void GraphicsManager::init() {
 	_zBuffer->sprites = nullptr;
 
 	// Colors
-	_currentBlankColour = _renderSurface.format.ARGBToColor(255, 0, 0, 0);
+	_currentBlankColour = _renderSurface.format.ARGBToColor(0, 0, 0, 0);
 	_currentBurnR = 0;
 	_currentBurnG = 0;
 	_currentBurnB = 0;
@@ -164,8 +164,7 @@ void GraphicsManager::display() {
 }
 
 void GraphicsManager::clear() {
-	_renderSurface.fillRect(Common::Rect(0, 0, _backdropSurface.w, _backdropSurface.h),
-			_renderSurface.format.RGBToColor(0, 0, 0));
+	_renderSurface.fillRect(Common::Rect(0, 0, _backdropSurface.w, _backdropSurface.h), _renderSurface.format.ARGBToColor(0, 0, 0, 0));
 }
 
 void GraphicsManager::aimCamera(int cameraX, int cameraY) {


Commit: 463031f88a41b9b46ac40aea9418db111a86ceaa
    https://github.com/scummvm/scummvm/commit/463031f88a41b9b46ac40aea9418db111a86ceaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-14T18:49:02+02:00

Commit Message:
GRAPHICS: MACGUI: Do not refresh full screen when cursor is away from menu

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 5024a81419..61dd3dd970 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1176,11 +1176,6 @@ bool MacMenu::mouseClick(int x, int y) {
 	if (_activeItem != -1) {
 		_activeSubItem = -1;
 
-		if (_menustack.size()) {
-			_contentIsDirty = true;
-			_wm->setFullRefresh(true);
-		}
-
 		return true;
 	}
 


Commit: f6c7f99b3dbab688db97be8026fbcdd947ce2572
    https://github.com/scummvm/scummvm/commit/f6c7f99b3dbab688db97be8026fbcdd947ce2572
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-14T18:49:02+02:00

Commit Message:
GRAPHICS: MACGUI: Simplified background restoration code in MacMenu

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 61dd3dd970..68dcbe2263 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1046,25 +1046,11 @@ bool MacMenu::mouseClick(int x, int y) {
 
 				if (_activeItem != -1) { // Restore background
 					if (_items[_activeItem]->submenu != nullptr) {
-						_wm->setFullRefresh(true);
-
-						if (_wm->_mode & kWMModalMenuMode) {
-							int x1 = _items[_activeItem]->submenu->bbox.left;
-							int y1 = _items[_activeItem]->submenu->bbox.top;
-							uint w = _items[_activeItem]->submenu->bbox.width() + 2;
-							uint h = _items[_activeItem]->submenu->bbox.height() + 2;
-
-							if (x1 + w > _wm->_screenCopy->w)
-								w = _wm->_screenCopy->w - 1 - x1;
-							if (y1 + h > _wm->_screenCopy->h)
-								h = _wm->_screenCopy->h - 1 - y1;
-
-							g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(x1, y1), _wm->_screenCopy->pitch, x1, y1, w, h);
-						}
+						if (_wm->_mode & kWMModalMenuMode)
+							g_system->copyRectToScreen(_wm->_screenCopy->getPixels(), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 
 						_menustack.pop_back(); // Drop previous submenu
 						_contentIsDirty = true;
-						_wm->setFullRefresh(true);
 					}
 				}
 
@@ -1104,19 +1090,8 @@ bool MacMenu::mouseClick(int x, int y) {
 
 		if (numSubItem != _activeSubItem) {
 			if (_wm->_mode & kWMModalMenuMode) {
-				if (_activeSubItem != -1 && menu->items[_activeSubItem]->submenu != nullptr) {
-					int x1 = menu->items[_activeSubItem]->submenu->bbox.left;
-					int y1 = menu->items[_activeSubItem]->submenu->bbox.top;
-					uint w = menu->items[_activeSubItem]->submenu->bbox.width() + 2;
-					uint h = menu->items[_activeSubItem]->submenu->bbox.height() + 2;
-
-					if (x1 + w > _wm->_screenCopy->w)
-						w = _wm->_screenCopy->w - 1 - x1;
-					if (y1 + h > _wm->_screenCopy->h)
-						h = _wm->_screenCopy->h - 1 - y1;
-
-					g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(x1, y1), _wm->_screenCopy->pitch, x1, y1, w, h);
-				}
+				if (_activeSubItem == -1 || menu->items[_activeSubItem]->submenu != nullptr)
+					g_system->copyRectToScreen(_wm->_screenCopy->getPixels(), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 			}
 			_activeSubItem = numSubItem;
 			menu->highlight = _activeSubItem;


Commit: 1e85ecf04814c805564e3fe8cbaf8e5126b43e49
    https://github.com/scummvm/scummvm/commit/1e85ecf04814c805564e3fe8cbaf8e5126b43e49
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-14T18:49:03+02:00

Commit Message:
GRAPHICS: MACGUI: Draw plain rectangle menu in Win95 mode

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 68dcbe2263..c042e6f529 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -812,7 +812,8 @@ bool MacMenu::draw(ManagedSurface *g, bool forceRedraw) {
 
 	_screen.clear(_wm->_colorGreen);
 
-	drawFilledRoundRect(&_screen, r, kDesktopArc, _wm->_colorWhite);
+	drawFilledRoundRect(&_screen, r, (_wm->_mode & kWMModeWin95) ? 0 : kDesktopArc, _wm->_colorWhite);
+
 	r.top = 7;
 	_screen.fillRect(r, _wm->_colorWhite);
 	r.top = kMenuHeight - 1;