ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added new darker colour for togglewidget background disabled bits.

This commit is contained in:
Stephen Anthony 2017-05-04 09:36:32 -02:30
parent 684c227381
commit 847e910d26
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/gui/DelayQueueWidget.cxx
View File

@ -97,7 +97,7 @@ void DelayQueueWidget::drawWidget(bool hilite)
y += 1; y += 1;
x += 1; x += 1;
w -= 1; w -= 1;
surface.fillRect(x, y, w - 1, _h - 2, kBGColorLo); surface.fillRect(x, y, w - 1, _h - 2, kBGColorHi);
y += 2; y += 2;
x += 2; x += 2;

2
src/debugger/gui/ToggleBitWidget.cxx
View File

@ -114,7 +114,7 @@ void ToggleBitWidget::drawWidget(bool hilite)
} }
else 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); s.drawString(_font, buffer, x, y, _colWidth, kTextColor);
} }
} }

7
src/emucore/FrameBuffer.cxx
View File

@ -885,7 +885,8 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom)
// Base colors // Base colors
kColor Normal foreground color (non-text) kColor Normal foreground color (non-text)
kBGColor Normal background 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 kShadowColor Item is disabled
kTextColor Normal text color kTextColor Normal text color
kTextColorHi Highlighted text color kTextColorHi Highlighted text color
@ -916,7 +917,7 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom)
*/ */
uInt32 FrameBuffer::ourGUIColors[2][kNumColors-256] = { uInt32 FrameBuffer::ourGUIColors[2][kNumColors-256] = {
// Standard // Standard
{ 0x686868, 0x000000, 0xdccfa5, 0x404040, 0x000000, 0x62a108, 0x9f0000, { 0x686868, 0x000000, 0xa38c61, 0xdccfa5, 0x404040, 0x000000, 0x62a108, 0x9f0000,
0xc9af7c, 0xf0f0cf, 0xc80000, 0xc9af7c, 0xf0f0cf, 0xc80000,
0xac3410, 0xd55941, 0xffffff, 0xffd652, 0xac3410, 0xd55941, 0xffffff, 0xffd652,
0xac3410, 0xac3410,
@ -926,7 +927,7 @@ uInt32 FrameBuffer::ourGUIColors[2][kNumColors-256] = {
}, },
// Classic // Classic
{ 0x686868, 0x000000, 0x404040, 0x404040, 0x20a020, 0x00ff00, 0xc80000, { 0x686868, 0x000000, 0x404040, 0x404040, 0x404040, 0x20a020, 0x00ff00, 0xc80000,
0x000000, 0x000000, 0xc80000, 0x000000, 0x000000, 0xc80000,
0x000000, 0x000000, 0x20a020, 0x00ff00, 0x000000, 0x000000, 0x20a020, 0x00ff00,
0x20a020, 0x20a020,

1
src/emucore/FrameBuffer.hxx
View File

@ -62,6 +62,7 @@ enum {
kColor = 256, kColor = 256,
kBGColor, kBGColor,
kBGColorLo, kBGColorLo,
kBGColorHi,
kShadowColor, kShadowColor,
kTextColor, kTextColor,
kTextColorHi, kTextColorHi,

2
src/gui/EditableWidget.cxx
View File

@ -72,7 +72,7 @@ void EditableWidget::setEditable(bool editable, bool hiliteBG)
else else
{ {
clearFlags(WIDGET_WANTS_RAWDATA | WIDGET_RETAIN_FOCUS); clearFlags(WIDGET_WANTS_RAWDATA | WIDGET_RETAIN_FOCUS);
_bgcolor = hiliteBG ? kBGColorLo : kWidColor; _bgcolor = hiliteBG ? kBGColorHi : kWidColor;
} }
} }

2
src/gui/Widget.cxx
View File

@ -492,7 +492,7 @@ void CheckboxWidget::setEditable(bool editable)
} }
else else
{ {
_bgcolor = kBGColorLo; _bgcolor = kBGColorHi;
setFill(CheckboxWidget::Inactive); setFill(CheckboxWidget::Inactive);
} }
} }