libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAGA2: Rename enums in bevel.h

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-10-28 23:34:23 +02:00
parent 019d06bb0f
commit 60e3d445ab
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
3 changed files with 20 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
engines/saga2/gbevel.h
View File

@ -36,88 +36,40 @@ namespace Saga2 {
enum bevelPens {
transpPen = 0, // transparent pen for mouse
kTranspPen = 0, // transparent pen for mouse
// color pens
blackPen, // black
whitePen, // white
kBlackPen, // black
kWhitePen, // white
// Background pens
backPen, // background fill
backLtPen, // background highlight
backDkPen, // background shadow
kBackPen, // background fill
kBackLtPen, // background highlight
kBackDkPen, // background shadow
// Button pens
buttonPen, // button fill color
buttonLtPen, // button highlight
buttonDkPen, // button shadow
kButtonPen, // button fill color
kButtonLtPen, // button highlight
kButtonDkPen, // button shadow
// UI highlighting pens
hilitePen, // text highlight color
kHilitePen, // text highlight color
cStdPenCount
kCStdPenCount
};
// Pen array definition
extern gPen mainPens[]; // the array of pens
#if 0
#define transpPen mainPens[0] // transparent pen for mouse
// color pens
#define blackPen mainPens[1] // black
#define whitePen mainPens[2] // white
// Background pens
#define backPen mainPens[3] // background fill
#define backLtPen mainPens[4] // background highlight
#define backDkPen mainPens[5] // background shadow
// Button pens
#define buttonPen mainPens[6] // button fill color
#define buttonLtPen mainPens[7] // button highlight
#define buttonDkPen mainPens[8] // button shadow
#define transpPen mainPens[0] // transparent pen for mouse
// color pens
#define blackPen mainPens[1] // black
#define whitePen mainPens[2] // white
// Background pens
#define backPen mainPens[3] // background fill
#define backLtPen mainPens[4] // background highlight
#define backDkPen mainPens[5] // background shadow
// Button pens
#define buttonPen mainPens[6] // button fill color
#define buttonLtPen mainPens[7] // button highlight
#define buttonDkPen mainPens[8] // button shadow
// Text pens
#define hilitePen mainPens[9] // text highlight color
#endif
/* ===================================================================== *
Bevel Boxes
* ===================================================================== */
enum bevelOptions {
bevelRecessed = (1 << 0), // bevel is pushed in
bevelFilled = (1 << 1), // bevel filled with approp. color
bevelInverted = (1 << 2) // pushed in w/slightly diff. look
kBevelRecessed = (1 << 0), // bevel is pushed in
kBevelFilled = (1 << 1), // bevel filled with approp. color
kBevelInverted = (1 << 2) // pushed in w/slightly diff. look
};
void DrawBevelFrame(gPort &port, const Rect16 &r, uint16 flags);

8
engines/saga2/msgbox.cpp
View File

@ -309,18 +309,18 @@ void SimpleWindow::DrawOutlineFrame(gPort &port, const Rect16 &r, int16 fillColo
int16 bottom = r.y + r.height - 2,
right = r.x + r.width - 2;
port.setIndirectColor(whitePen);
port.setIndirectColor(kWhitePen);
port.vLine(r.x + 1, r.y + 1, r.height - 3);
port.hLine(r.x + 2, r.y + 1, r.width - 3);
port.setIndirectColor(blackPen);
port.setIndirectColor(kBlackPen);
port.frameRect(r, 1);
port.setIndirectColor(buttonDkPen);
port.setIndirectColor(kButtonDkPen);
port.hLine(r.x + 1, bottom, r.width - 2);
port.vLine(right, r.y + 1, r.height - 2);
port.setIndirectColor(buttonPen);
port.setIndirectColor(kButtonPen);
port.setPixel(r.x + 1, bottom);
port.setPixel(right, r.y + 1);

4
engines/saga2/panel.cpp
View File

@ -232,12 +232,12 @@ void gPanel::drawTitle(enum text_positions placement) {
SAVE_GPORT_STATE(port); // save pen color, etc.
if (_imageLabel) {
port.setIndirectColor(blackPen); // pen color black
port.setIndirectColor(kBlackPen); // pen color black
port.setMode(drawModeColor); // draw as glyph
port.bltPixels(*img, 0, 0, r.x, r.y, r.width, r.height);
} else {
port.setMode(drawModeMatte); // draw as glyph
port.setIndirectColor(blackPen); // pen color black
port.setIndirectColor(kBlackPen); // pen color black
port.setStyle(textStyleUnderBar); // set style to do underbars
port.moveTo(r.x, r.y); // move to new text pos