diff --git a/src/debugger/gui/DelayQueueWidget.cxx b/src/debugger/gui/DelayQueueWidget.cxx index bc4281195..5da8c6d70 100644 --- a/src/debugger/gui/DelayQueueWidget.cxx +++ b/src/debugger/gui/DelayQueueWidget.cxx @@ -97,7 +97,7 @@ void DelayQueueWidget::drawWidget(bool hilite) y += 1; x += 1; w -= 1; - surface.fillRect(x, y, w - 1, _h - 2, kBGColorLo); + surface.fillRect(x, y, w - 1, _h - 2, kBGColorHi); y += 2; x += 2; diff --git a/src/debugger/gui/ToggleBitWidget.cxx b/src/debugger/gui/ToggleBitWidget.cxx index 3ed6ce4d6..857b62629 100644 --- a/src/debugger/gui/ToggleBitWidget.cxx +++ b/src/debugger/gui/ToggleBitWidget.cxx @@ -114,7 +114,7 @@ void ToggleBitWidget::drawWidget(bool hilite) } else { - s.fillRect(x - 3, y - 1, _colWidth-1, _rowHeight-1, kBGColorLo); + s.fillRect(x - 3, y - 1, _colWidth-1, _rowHeight-1, kBGColorHi); s.drawString(_font, buffer, x, y, _colWidth, kTextColor); } } diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index 4ec816d09..0b9139243 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -885,7 +885,8 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom) // Base colors kColor Normal foreground color (non-text) kBGColor Normal background color (non-text) - kBGColorLo Disabled background color (non-text) + kBGColorLo Disabled background color dark (non-text) + kBGColorHi Disabled background color light (non-text) kShadowColor Item is disabled kTextColor Normal text color kTextColorHi Highlighted text color @@ -916,7 +917,7 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom) */ uInt32 FrameBuffer::ourGUIColors[2][kNumColors-256] = { // Standard - { 0x686868, 0x000000, 0xdccfa5, 0x404040, 0x000000, 0x62a108, 0x9f0000, + { 0x686868, 0x000000, 0xa38c61, 0xdccfa5, 0x404040, 0x000000, 0x62a108, 0x9f0000, 0xc9af7c, 0xf0f0cf, 0xc80000, 0xac3410, 0xd55941, 0xffffff, 0xffd652, 0xac3410, @@ -926,7 +927,7 @@ uInt32 FrameBuffer::ourGUIColors[2][kNumColors-256] = { }, // Classic - { 0x686868, 0x000000, 0x404040, 0x404040, 0x20a020, 0x00ff00, 0xc80000, + { 0x686868, 0x000000, 0x404040, 0x404040, 0x404040, 0x20a020, 0x00ff00, 0xc80000, 0x000000, 0x000000, 0xc80000, 0x000000, 0x000000, 0x20a020, 0x00ff00, 0x20a020, diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx index 7e055beb1..0b43a42f0 100644 --- a/src/emucore/FrameBuffer.hxx +++ b/src/emucore/FrameBuffer.hxx @@ -62,6 +62,7 @@ enum { kColor = 256, kBGColor, kBGColorLo, + kBGColorHi, kShadowColor, kTextColor, kTextColorHi, diff --git a/src/gui/EditableWidget.cxx b/src/gui/EditableWidget.cxx index ad3dc477e..de2550655 100644 --- a/src/gui/EditableWidget.cxx +++ b/src/gui/EditableWidget.cxx @@ -72,7 +72,7 @@ void EditableWidget::setEditable(bool editable, bool hiliteBG) else { clearFlags(WIDGET_WANTS_RAWDATA | WIDGET_RETAIN_FOCUS); - _bgcolor = hiliteBG ? kBGColorLo : kWidColor; + _bgcolor = hiliteBG ? kBGColorHi : kWidColor; } } diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index bb9ab44a3..5a2bc8d24 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -492,7 +492,7 @@ void CheckboxWidget::setEditable(bool editable) } else { - _bgcolor = kBGColorLo; + _bgcolor = kBGColorHi; setFill(CheckboxWidget::Inactive); } }