[Scummvm-git-logs] scummvm master -> 96260127522aaf1d03483da958602c4b17f04c3f

[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:
a6b0d088c2 Revert "GRAPHICS: MACGUI: Fix green borders in upper right and upper left corners of Mac menu bar"
9626012752 MACGUI: Fill in the upper-left and upper-right corners with black


Commit: a6b0d088c2c1ecd042ac9709fbe6fd3566fd610c
    https://github.com/scummvm/scummvm/commit/a6b0d088c2c1ecd042ac9709fbe6fd3566fd610c
Author: polyesterswing (kurianjojo2004 at gmail.com)
Date: 2024-03-04T19:16:22+01:00

Commit Message:
Revert "GRAPHICS: MACGUI: Fix green borders in upper right and upper left corners of Mac menu bar"

This reverts commit 49ae002d6b13d97c7a8825a62ff1f8af56150eb8.

The changes in this commit prevents windows in macventure from
displaying

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 7507bc4641d..aba52eb62ec 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1001,7 +1001,7 @@ bool MacMenu::draw(ManagedSurface *g, bool forceRedraw) {
 
 	_contentIsDirty = false;
 
-	_screen.clear(_wm->_colorBlack);
+	_screen.clear(_wm->_colorGreen);
 
 	bool shouldUseDesktopArc = !(_wm->_mode & kWMModeWin95) || (_wm->_mode & kWMModeForceMacBorder);
 	drawFilledRoundRect(&_screen, r, shouldUseDesktopArc ? kDesktopArc : 0, _wm->_colorWhite);


Commit: 96260127522aaf1d03483da958602c4b17f04c3f
    https://github.com/scummvm/scummvm/commit/96260127522aaf1d03483da958602c4b17f04c3f
Author: polyesterswing (kurianjojo2004 at gmail.com)
Date: 2024-03-04T19:16:22+01:00

Commit Message:
MACGUI: Fill in the upper-left and upper-right corners with black

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index aba52eb62ec..d51b723b60e 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1004,6 +1004,10 @@ bool MacMenu::draw(ManagedSurface *g, bool forceRedraw) {
 	_screen.clear(_wm->_colorGreen);
 
 	bool shouldUseDesktopArc = !(_wm->_mode & kWMModeWin95) || (_wm->_mode & kWMModeForceMacBorder);
+
+	// Fill in the corners with black
+	_screen.fillRect(r, _wm->_colorBlack);
+
 	drawFilledRoundRect(&_screen, r, shouldUseDesktopArc ? kDesktopArc : 0, _wm->_colorWhite);
 
 	r.top = 7;