thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: MACGUI: Improve grays naming

Browse source
This commit is contained in:
djsrv 2020-08-07 18:55:17 -04:00
parent 5f55ae169b
commit a9346eea42
5 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/macventure/gui.cpp
View file

@ -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;
}
}
}

2
engines/wage/design.cpp
View file

@ -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);

2
graphics/macgui/macwindow.cpp
View file

@ -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);
}

17
graphics/macgui/macwindowmanager.cpp
View file

@ -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);

13
graphics/macgui/macwindowmanager.h
View file

@ -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;