"Light" color fix

This commit is contained in:
thrust26 2017-12-19 16:56:01 +01:00
parent 0385dd4b01
commit 7259af1583
3 changed files with 11 additions and 8 deletions

View File

@ -182,9 +182,7 @@ void TiaOutputWidget::drawWidget(bool hilite)
s.drawPixels(myLineBuffer, _x + 1, _y + 1 + y, width << 1);
}
uInt32 beamColor = kBtnTextColor;
if(instance().settings().getString("uipalette") == "light")
beamColor = kWidColor;
uInt32 beamColor = kColorInfo;
// Show electron beam position
if(visible && scanx < width && scany+2u < height)

View File

@ -227,7 +227,7 @@ FBInitStatus FrameBuffer::createDisplay(const string& title,
myMsg.counter = 0;
// Create surfaces for TIA statistics and general messages
myStatsMsg.color = kBtnTextColor;
myStatsMsg.color = kColorInfo;
myStatsMsg.w = infoFont().getMaxCharWidth() * 24 + 2;
myStatsMsg.h = (infoFont().getFontHeight() + 2) * 2;
@ -950,6 +950,8 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom)
kDbgChangedTextColor Text color for changed cells
kDbgColorHi Highlighted color in debugger data cells
kDbgColorRed Red color in debugger
*** Info color ***
kColorinfo
*/
uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
// Standard
@ -961,8 +963,8 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0xac3410, 0xd55941,
0xac3410, 0xd55941,
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000,
},
0xffffff
},
// Classic
{ 0x686868, 0x000000, 0x404040, 0x404040, 0x404040,
0x20a020, 0x00ff00, 0xc80000, 0x20a020,
@ -971,7 +973,8 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0x20a020,
0x20a020, 0x00ff00,
0x20a020, 0x00ff00,
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000,
0x20a020
},
// Light
{
@ -982,6 +985,7 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0x333333, // checkbox
0x808080, 0x0078d7, // scrollbar
0x333333, 0x0078d7, // slider
0xffc0c0, 0x000000, 0xe00000, 0xc00000 // debugger
0xffc0c0, 0x000000, 0xe00000, 0xc00000, // debugger
0xffffff // info
}
};

View File

@ -67,6 +67,7 @@ enum {
kDbgChangedTextColor,
kDbgColorHi,
kDbgColorRed,
kColorInfo,
kNumColors
};