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

dirty fix for #355

This commit is contained in:
thrust26 2018-08-22 11:10:45 +02:00
parent 858d6991ca
commit 21b8fa133f
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emucore/FrameBuffer.cxx
View File

@ -1068,17 +1068,17 @@ void FrameBuffer::VideoModeList::setZoom(uInt32 zoom)
*** Scrollbar colors ***
kScrollColor Normal scrollbar color
kScrollColorHi Highlighted scrollbar color
*** Debugger colors ***
kDbgChangedColor Background color for changed cells
kDbgChangedTextColor Text color for changed cells
kDbgColorHi Highlighted color in debugger data cells
kDbgColorRed Red color in debugger
*** Slider colors ***
kSliderColor Enabled slider
kSliderColorHi Focussed slider
kSliderBGColor Enabled slider background
kSliderBGColorHi Focussed slider background
kSliderBGColorLo Disabled slider background
*** Debugger colors ***
kDbgChangedColor Background color for changed cells
kDbgChangedTextColor Text color for changed cells
kDbgColorHi Highlighted color in debugger data cells
kDbgColorRed Red color in debugger
*** Other colors ***
kColorInfo TIA output position color
kColorTitleBar Title bar color
@ -1094,8 +1094,8 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0xac3410, 0xd55941, 0x686868, 0xdccfa5, 0xf0f0cf, 0xf0f0cf, // buttons
0xac3410, // checkbox
0xac3410, 0xd55941, // scrollbar
0xac3410, 0xd55941, 0xdccfa5, 0xf0f0cf, 0xa38c61, // slider
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger
0xac3410, 0xd55941, 0xdccfa5, 0xf0f0cf, 0xa38c61, // slider
0xffffff, 0xac3410, 0xf0f0cf, 0x686868, 0xdccfa5 // other
},
// Classic
@ -1105,8 +1105,8 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0x000000, 0x000000, 0x686868, 0x00ff00, 0x20a020, 0x00ff00, // buttons
0x20a020, // checkbox
0x20a020, 0x00ff00, // scrollbar
0x20a020, 0x00ff00, 0x404040, 0x686868, 0x404040, // slider
0xc80000, 0x00ff00, 0xc8c8ff, 0xc80000, // debugger
0x20a020, 0x00ff00, 0x404040, 0x686868, 0x404040, // slider
0x00ff00, 0x20a020, 0x000000, 0x686868, 0x404040 // other
},
// Light
@ -1116,8 +1116,8 @@ uInt32 FrameBuffer::ourGUIColors[3][kNumColors-256] = {
0xe1e1e1, 0xe5f1fb, 0x808080, 0x0078d7, 0x000000, 0x000000, // buttons
0x333333, // checkbox
0xc0c0c0, 0x808080, // scrollbar
0x333333, 0x0078d7, 0xc0c0c0, 0xffffff, 0xc0c0c0, // slider 0xBDDEF9| 0xe1e1e1 | 0xffffff
0xffc0c0, 0x000000, 0xe00000, 0xc00000, // debugger
0x333333, 0x0078d7, 0xc0c0c0, 0xffffff, 0xc0c0c0, // slider 0xBDDEF9| 0xe1e1e1 | 0xffffff
0xffffff, 0x333333, 0xf0f0f0, 0x808080, 0xc0c0c0 // other
}
};

27
src/emucore/FrameBufferConstants.hxx
View File

@ -46,37 +46,46 @@ enum class MessagePosition {
// the future, if necessary
using ColorId = uInt32;
static constexpr ColorId
// *** Base colors ***
kColor = 256,
kBGColor = 257,
kBGColorLo = 258,
kBGColorHi = 259,
kShadowColor = 260,
// *** Text colors ***
kTextColor = 261,
kTextColorHi = 262,
kTextColorEm = 263,
kTextColorInv = 264,
// *** UI elements(dialog and widgets) ***
kDlgColor = 265,
kWidColor = 266,
kWidColorHi = 267,
kWidFrameColor = 268,
// *** Button colors ***
kBtnColor = 269,
kBtnColorHi = 270,
kBtnBorderColor = 271,
kBtnBorderColorHi = 272,
kBtnTextColor = 273,
kBtnTextColorHi = 274,
// *** Checkbox colors ***
kCheckColor = 275,
// *** Scrollbar colors ***
kScrollColor = 276,
kScrollColorHi = 277,
kSliderColor = 278,
kSliderColorHi = 279,
kSliderBGColor = 280,
kSliderBGColorHi = 281,
kSliderBGColorLo = 282,
kDbgChangedColor = 283,
kDbgChangedTextColor = 284,
kDbgColorHi = 285,
kDbgColorRed = 286,
// *** Debugger colors ***
kDbgChangedColor = 278,
kDbgChangedTextColor = 279,
kDbgColorHi = 280,
kDbgColorRed = 281, // Note: this must be < 0x11e (286)! (see PromptWidget::putcharIntern)
// *** Slider colors ***
kSliderColor = 282,
kSliderColorHi = 283,
kSliderBGColor = 284,
kSliderBGColorHi = 285,
kSliderBGColorLo = 286,
// *** Other colors ***
kColorInfo = 287,
kColorTitleBar = 288,
kColorTitleText = 289,