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

formatting for hit traps and changed source addresses changed

This commit is contained in:
thrust26 2017-10-13 12:18:41 +02:00
parent 576773f837
commit 44f7029573
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emucore/M6502.cxx
View File

@ -133,7 +133,8 @@ inline uInt8 M6502::peek(uInt16 address, uInt8 flags)
if(cond > -1) if(cond > -1)
{ {
myJustHitReadTrapFlag = true; myJustHitReadTrapFlag = true;
myHitTrapInfo.message = "RTrap(" + myTrapCondNames[cond] + "): "; myHitTrapInfo.message = "RTrap"
+ (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
myHitTrapInfo.address = address; myHitTrapInfo.address = address;
} }
} }
@ -165,7 +166,8 @@ inline void M6502::poke(uInt16 address, uInt8 value, uInt8 flags)
if(cond > -1) if(cond > -1)
{ {
myJustHitWriteTrapFlag = true; myJustHitWriteTrapFlag = true;
myHitTrapInfo.message = "WTrap(" + myTrapCondNames[cond] + "): "; myHitTrapInfo.message = "WTrap"
+ (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
myHitTrapInfo.address = address; myHitTrapInfo.address = address;
} }
} }

3
src/gui/EditTextWidget.cxx
View File

@ -72,10 +72,9 @@ void EditTextWidget::drawWidget(bool hilite)
// Highlight changes // Highlight changes
if(_changed) if(_changed)
s.fillRect(_x, _y, _w, _h, kDbgChangedColor); s.fillRect(_x, _y, _w, _h, kDbgChangedColor);
if(!isEditable()) else if(!isEditable())
s.fillRect(_x, _y, _w, _h, kBGColorHi); s.fillRect(_x, _y, _w, _h, kBGColorHi);
// Draw a thin frame around us. // Draw a thin frame around us.
s.hLine(_x, _y, _x + _w - 1, kColor); s.hLine(_x, _y, _x + _w - 1, kColor);
s.hLine(_x, _y + _h - 1, _x +_w - 1, kShadowColor); s.hLine(_x, _y + _h - 1, _x +_w - 1, kShadowColor);