[Scummvm-git-logs] scummvm master -> 315f43f4607a31d1a5c751ec8bdfd35881753b9b
djsrv
dservilla at gmail.com
Fri Aug 7 23:05:31 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5f55ae169b GRAPHICS: MACGUI: Fix several border bitmaps
a9346eea42 GRAPHICS: MACGUI: Improve grays naming
04e7bcee3f GRAPHICS: MACGUI: Lighten inactive window borders
1678c7621e GRAPHICS: MACGUI: Fix inactive title color
315f43f460 DIRECTOR: Initialize window type to -1
Commit: 5f55ae169be604073bea617617152dc5b2807eaf
https://github.com/scummvm/scummvm/commit/5f55ae169be604073bea617617152dc5b2807eaf
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-07T18:17:35-04:00
Commit Message:
GRAPHICS: MACGUI: Fix several border bitmaps
Changed paths:
devtools/create_macgui/RoundClose_act.bmp
devtools/create_macgui/RoundClose_inac.bmp
devtools/create_macgui/ThickZoom_inac.bmp
diff --git a/devtools/create_macgui/RoundClose_act.bmp b/devtools/create_macgui/RoundClose_act.bmp
index d75b26ba35..a713817602 100644
Binary files a/devtools/create_macgui/RoundClose_act.bmp and b/devtools/create_macgui/RoundClose_act.bmp differ
diff --git a/devtools/create_macgui/RoundClose_inac.bmp b/devtools/create_macgui/RoundClose_inac.bmp
index 929cb56030..9acd9baf87 100644
Binary files a/devtools/create_macgui/RoundClose_inac.bmp and b/devtools/create_macgui/RoundClose_inac.bmp differ
diff --git a/devtools/create_macgui/ThickZoom_inac.bmp b/devtools/create_macgui/ThickZoom_inac.bmp
index 8d4c1746f6..5776d8e5c8 100644
Binary files a/devtools/create_macgui/ThickZoom_inac.bmp and b/devtools/create_macgui/ThickZoom_inac.bmp differ
Commit: a9346eea42549e96efead6dd08e249866a046257
https://github.com/scummvm/scummvm/commit/a9346eea42549e96efead6dd08e249866a046257
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-07T18:55:17-04:00
Commit Message:
GRAPHICS: MACGUI: Improve grays naming
Changed paths:
engines/macventure/gui.cpp
engines/wage/design.cpp
graphics/macgui/macwindow.cpp
graphics/macgui/macwindowmanager.cpp
graphics/macgui/macwindowmanager.h
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 6db7a1201b..6551a8d2ff 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -820,7 +820,7 @@ void Gui::updateWindow(WindowReference winID, bool containerOpen) {
drawMainGameWindow();
} else {
Graphics::MacWindow *winRef = findWindow(winID);
- winRef->getWindowSurface()->fillRect(data.bounds, kColorGray);
+ winRef->getWindowSurface()->fillRect(data.bounds, kColorGray80);
}
if (data.type == kZoomDoc && data.updateScroll) {
warning("Unimplemented: update scroll");
@@ -1245,7 +1245,7 @@ void Gui::invertWindowColors(WindowReference winID) {
for (uint x = 0; x < srf->w; x++) {
byte p = *(byte *)srf->getBasePtr(x, y);
*(byte *)srf->getBasePtr(x, y) =
- (p == kColorWhite) ? kColorBlack : kColorGray;
+ (p == kColorWhite) ? kColorBlack : kColorGray80;
}
}
}
diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 9bb3693be5..90acc704df 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -111,7 +111,7 @@ void Design::paint(Graphics::ManagedSurface *surface, Graphics::MacPatterns &pat
PlotData pd(_surface, &patterns, 8, 1, this);
int x1 = 50, y1 = 50, x2 = 200, y2 = 200, borderThickness = 30;
Common::Rect inn(x1-5, y1-5, x2+5, y2+5);
- drawRoundRect(inn, 6, kColorGray, false, drawPixelPlain, &pd);
+ drawRoundRect(inn, 6, kColorGray80, false, drawPixelPlain, &pd);
drawThickLine(x1, y1, x2-borderThickness, y1, borderThickness, kColorBlack, drawPixel, &pd);
drawThickLine(x2-borderThickness, y1, x2-borderThickness, y2, borderThickness, kColorBlack, drawPixel, &pd);
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index f246baf3d4..ba6ed6b50a 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -283,7 +283,7 @@ void MacWindow::drawBorder() {
if (_macBorder.hasBorder(_active)) {
if (_active && !_macBorder.getOffset().dark)
- fillRect(g, (width - w) / 2, titleY, w, titleHeight, _wm->_colorOffWhite);
+ fillRect(g, (width - w) / 2, titleY, w, titleHeight, _wm->_colorGrayEE);
} else {
drawBox(g, (width - w) / 2, titleY, w, titleHeight);
}
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 10f81b36f1..58e0257e2c 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -40,11 +40,12 @@ namespace Graphics {
static const byte palette[] = {
0, 0, 0, // Black
- 0x80, 0x80, 0x80, // Gray
+ 0x80, 0x80, 0x80, // Gray80
+ 0x88, 0x88, 0x88, // Gray88
+ 0xee, 0xee, 0xee, // GrayEE
0xff, 0xff, 0xff, // White
0x00, 0xff, 0x00, // Green
- 0x00, 0xcf, 0x00, // Green2
- 0xee, 0xee, 0xee // OffWhite
+ 0x00, 0xcf, 0x00 // Green2
};
static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, // kPatternSolid
@@ -178,11 +179,12 @@ MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns) {
_redrawEngineCallback = nullptr;
_colorBlack = kColorBlack;
- _colorGray = kColorGray;
+ _colorGray80 = kColorGray80;
+ _colorGray88 = kColorGray88;
+ _colorGrayEE = kColorGrayEE;
_colorWhite = kColorWhite;
_colorGreen = kColorGreen;
_colorGreen2 = kColorGreen2;
- _colorOffWhite = kColorOffWhite;
_fullRefresh = true;
@@ -830,11 +832,12 @@ void MacWindowManager::passPalette(const byte *pal, uint size) {
_colorHash.clear();
_colorWhite = findBestColor(palette[kColorWhite * 3], palette[kColorWhite * 3 + 1], palette[kColorWhite * 3 + 2]);
- _colorGray = findBestColor(palette[kColorGray * 3], palette[kColorGray * 3 + 1], palette[kColorGray * 3 + 2]);
+ _colorGray80 = findBestColor(palette[kColorGray80 * 3], palette[kColorGray80 * 3 + 1], palette[kColorGray80 * 3 + 2]);
+ _colorGray88 = findBestColor(palette[kColorGray88 * 3], palette[kColorGray88 * 3 + 1], palette[kColorGray88 * 3 + 2]);
+ _colorGrayEE = findBestColor(palette[kColorGrayEE * 3], palette[kColorGrayEE * 3 + 1], palette[kColorGrayEE * 3 + 2]);
_colorBlack = findBestColor(palette[kColorBlack * 3], palette[kColorBlack * 3 + 1], palette[kColorBlack * 3 + 2]);
_colorGreen = findBestColor(palette[kColorGreen * 3], palette[kColorGreen * 3 + 1], palette[kColorGreen * 3 + 2]);
_colorGreen2 = findBestColor(palette[kColorGreen2 * 3], palette[kColorGreen2 * 3 + 1], palette[kColorGreen2 * 3 + 2]);
- _colorOffWhite = findBestColor(palette[kColorOffWhite * 3], palette[kColorOffWhite * 3 + 1], palette[kColorOffWhite * 3 + 2]);
drawDesktop();
setFullRefresh(true);
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index fcf40c9bec..e4ac87c80e 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -46,11 +46,12 @@ enum {
enum {
kColorBlack = 0,
- kColorGray = 1,
- kColorWhite = 2,
- kColorGreen = 3,
- kColorGreen2 = 4,
- kColorOffWhite = 5,
+ kColorGray80 = 1,
+ kColorGray88 = 2,
+ kColorGrayEE = 3,
+ kColorWhite = 4,
+ kColorGreen = 5,
+ kColorGreen2 = 6,
kColorCount
};
@@ -304,7 +305,7 @@ public:
bool _menuTimerActive;
bool _mouseDown;
- int _colorBlack, _colorGray, _colorWhite, _colorGreen, _colorGreen2, _colorOffWhite;
+ int _colorBlack, _colorGray80, _colorGray88, _colorGrayEE, _colorWhite, _colorGreen, _colorGreen2;
MacWidget *_hoveredWidget;
Commit: 04e7bcee3f93b330b2efcf49333ac05a7ad8e8c1
https://github.com/scummvm/scummvm/commit/04e7bcee3f93b330b2efcf49333ac05a7ad8e8c1
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-07T18:55:43-04:00
Commit Message:
GRAPHICS: MACGUI: Lighten inactive window borders
Changed paths:
devtools/create_macgui/StandardCloseZoom_inac.bmp
devtools/create_macgui/StandardClose_inac.bmp
devtools/create_macgui/Standard_inac.bmp
devtools/create_macgui/ThinNoTitleShadow_inac.bmp
devtools/create_macgui/ThinNoTitle_inac.bmp
diff --git a/devtools/create_macgui/StandardCloseZoom_inac.bmp b/devtools/create_macgui/StandardCloseZoom_inac.bmp
index 41524ec40a..d30e3572b3 100644
Binary files a/devtools/create_macgui/StandardCloseZoom_inac.bmp and b/devtools/create_macgui/StandardCloseZoom_inac.bmp differ
diff --git a/devtools/create_macgui/StandardClose_inac.bmp b/devtools/create_macgui/StandardClose_inac.bmp
index edc1afe1b3..284744a4f6 100644
Binary files a/devtools/create_macgui/StandardClose_inac.bmp and b/devtools/create_macgui/StandardClose_inac.bmp differ
diff --git a/devtools/create_macgui/Standard_inac.bmp b/devtools/create_macgui/Standard_inac.bmp
index 04f1cf6c8c..e8b3220fb3 100644
Binary files a/devtools/create_macgui/Standard_inac.bmp and b/devtools/create_macgui/Standard_inac.bmp differ
diff --git a/devtools/create_macgui/ThinNoTitleShadow_inac.bmp b/devtools/create_macgui/ThinNoTitleShadow_inac.bmp
index b81ac280c3..a93207bfeb 100644
Binary files a/devtools/create_macgui/ThinNoTitleShadow_inac.bmp and b/devtools/create_macgui/ThinNoTitleShadow_inac.bmp differ
diff --git a/devtools/create_macgui/ThinNoTitle_inac.bmp b/devtools/create_macgui/ThinNoTitle_inac.bmp
index 8f73ea07db..b2ed7f449e 100644
Binary files a/devtools/create_macgui/ThinNoTitle_inac.bmp and b/devtools/create_macgui/ThinNoTitle_inac.bmp differ
Commit: 1678c7621eeb11400e787a2b330fae76ea92dbf3
https://github.com/scummvm/scummvm/commit/1678c7621eeb11400e787a2b330fae76ea92dbf3
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-07T19:00:07-04:00
Commit Message:
GRAPHICS: MACGUI: Fix inactive title color
Changed paths:
graphics/macgui/macwindow.cpp
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index ba6ed6b50a..428910d168 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -260,7 +260,10 @@ void MacWindow::drawBorder() {
if (_macBorder.getOffset().titleTop == -1 && _macBorder.getOffset().titleBottom == -1)
return;
- titleColor = _macBorder.getOffset().dark ? _wm->_colorWhite : _wm->_colorBlack;
+ titleColor = _wm->_colorGray88;
+ if (_active)
+ titleColor = _macBorder.getOffset().dark ? _wm->_colorWhite : _wm->_colorBlack;
+
titleY = _macBorder.getOffset().titleTop;
titleHeight = _macBorder.getOffset().top - titleY - _macBorder.getOffset().titleBottom;
sidesWidth = _macBorder.getOffset().left + _macBorder.getOffset().right;
Commit: 315f43f4607a31d1a5c751ec8bdfd35881753b9b
https://github.com/scummvm/scummvm/commit/315f43f4607a31d1a5c751ec8bdfd35881753b9b
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-07T19:01:11-04:00
Commit Message:
DIRECTOR: Initialize window type to -1
Changed paths:
engines/director/window.cpp
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 09ded6933c..d6cf183c73 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -57,7 +57,7 @@ Window::Window(int id, bool scrollable, bool resizable, bool editable, Graphics:
_objType = kWindowObj;
_startFrame = _vm->getStartMovie().startFrame;
- _windowType = 0;
+ _windowType = -1;
_titleVisible = true;
updateBorderType();
}
More information about the Scummvm-git-logs
mailing list