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

Overlapped dialogs are (partially) toned down

This commit is contained in:
thrust26 2018-01-26 12:55:05 +01:00
parent 35275b0104
commit 8c0b212207
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emucore/FrameBuffer.cxx
View File

@ -1017,8 +1017,8 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom)
kDbgColorRed Red color in debugger kDbgColorRed Red color in debugger
*** Other colors *** *** Other colors ***
kColorInfo TIA output position color kColorInfo TIA output position color
kTitleBarColor Title bar color kColorTitleBar Title bar color
kTitleTextColor Title text color kColorTitleText Title text color
*/ */
uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = { uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
// Standard // Standard
@ -1030,7 +1030,7 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0xac3410, 0xd55941, // scrollbar 0xac3410, 0xd55941, // scrollbar
0xac3410, 0xd55941, // slider 0xac3410, 0xd55941, // slider
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger 0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger
0xffffff, 0xac3410, 0xf0f0cf // other 0xffffff, 0xac3410, 0xf0f0cf, 0x686868, 0xdccfa5 // other
}, },
// Classic // Classic
{ 0x686868, 0x000000, 0x404040, 0x404040, 0x404040, // base { 0x686868, 0x000000, 0x404040, 0x404040, 0x404040, // base
@ -1041,7 +1041,7 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0x20a020, 0x00ff00, // scrollbar 0x20a020, 0x00ff00, // scrollbar
0x20a020, 0x00ff00, // slider 0x20a020, 0x00ff00, // slider
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger 0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger
0x20a020, 0x20a020, 0x000000 // other 0x20a020, 0x20a020, 0x000000, 0x686868, 0x404040 // other
}, },
// Light // Light
{ 0x808080, 0x000000, 0xc0c0c0, 0xe1e1e1, 0x333333, // base { 0x808080, 0x000000, 0xc0c0c0, 0xe1e1e1, 0x333333, // base
@ -1052,6 +1052,6 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0xc0c0c0, 0x808080, // scrollbar 0xc0c0c0, 0x808080, // scrollbar
0x333333, 0x0078d7, // slider 0x333333, 0x0078d7, // slider
0xffc0c0, 0x000000, 0xe00000, 0xc00000, // debugger 0xffc0c0, 0x000000, 0xe00000, 0xc00000, // debugger
0xffffff, 0x808080, 0xffffff // other 0xffffff, 0x333333, 0xf0f0f0, 0x808080, 0xc0c0c0 // other
} }
}; };

2
src/emucore/FrameBufferConstants.hxx
View File

@ -73,6 +73,8 @@ enum {
kColorInfo, kColorInfo,
kColorTitleBar, kColorTitleBar,
kColorTitleText, kColorTitleText,
kColorTitleBarLo,
kColorTitleTextLo,
kNumColors kNumColors
}; };

5
src/gui/Dialog.cxx
View File

@ -314,15 +314,16 @@ void Dialog::drawDialog()
if(!isVisible()) if(!isVisible())
return; return;
FBSurface& s = surface();
if(_dirty) if(_dirty)
{ {
FBSurface& s = surface();
bool onTop = parent().myDialogStack.top() == this; bool onTop = parent().myDialogStack.top() == this;
if(_flags & WIDGET_CLEARBG) if(_flags & WIDGET_CLEARBG)
{ {
// cerr << "Dialog::drawDialog(): w = " << _w << ", h = " << _h << " @ " << &s << endl << endl; // cerr << "Dialog::drawDialog(): w = " << _w << ", h = " << _h << " @ " << &s << endl << endl;
s.fillRect(_x, _y + _th, _w, _h - _th, kDlgColor); s.fillRect(_x, _y + _th, _w, _h - _th, onTop ? kDlgColor : kBGColorLo);
if(_th) if(_th)
{ {
s.fillRect(_x, _y, _w, _th, onTop ? kColorTitleBar : kColorTitleBarLo); s.fillRect(_x, _y, _w, _th, onTop ? kColorTitleBar : kColorTitleBarLo);