The PF register in the debugger no longer shows COLUBK.

Some minor rearranging of the 'queued writes' widget.
This commit is contained in:
Stephen Anthony 2017-04-04 18:19:11 -02:30
parent d3b50b5194
commit 60322a10d4
2 changed files with 3 additions and 8 deletions

View File

@ -31,7 +31,7 @@ DelayQueueWidget::DelayQueueWidget(
{ {
_textcolor = kTextColor; _textcolor = kTextColor;
_w = 300; _w = 20 * font.getMaxCharWidth() + 6;
_h = 3 * font.getLineHeight() + 6; _h = 3 * font.getLineHeight() + 6;
myLines[0] = myLines[1] = myLines[2]; myLines[0] = myLines[1] = myLines[2];

View File

@ -525,11 +525,10 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont,
xpos = 10; xpos = 10;
ypos += 2 * lineHeight; ypos += 2 * lineHeight;
new StaticTextWidget(boss, lfont, xpos, ypos, 20*fontWidth, fontHeight, t = new StaticTextWidget(boss, lfont, xpos, ypos, 14*fontWidth, fontHeight,
"Queued Writes:", kTextAlignLeft); "Queued Writes:", kTextAlignLeft);
ypos += 1.3*lineHeight; xpos += t->getWidth() + 10;
xpos = 10;
myDelayQueueWidget = new DelayQueueWidget(boss, lfont, xpos, ypos); myDelayQueueWidget = new DelayQueueWidget(boss, lfont, xpos, ypos);
// How to handle undriven pins // How to handle undriven pins
@ -888,20 +887,16 @@ void TiaWidget::loadConfig()
//////////////////////////// ////////////////////////////
// PF register info // PF register info
//////////////////////////// ////////////////////////////
int pfx_bgcolor = !tia.priorityPF() ? state.coluRegs[3] : -1;
// PF0 // PF0
myPF[0]->setColor(state.coluRegs[2]); myPF[0]->setColor(state.coluRegs[2]);
myPF[0]->setBackgroundColor(pfx_bgcolor);
myPF[0]->setIntState(state.pf[0], true); // reverse bit order myPF[0]->setIntState(state.pf[0], true); // reverse bit order
// PF1 // PF1
myPF[1]->setColor(state.coluRegs[2]); myPF[1]->setColor(state.coluRegs[2]);
myPF[1]->setBackgroundColor(pfx_bgcolor);
myPF[1]->setIntState(state.pf[1], false); myPF[1]->setIntState(state.pf[1], false);
// PF2 // PF2
myPF[2]->setColor(state.coluRegs[2]); myPF[2]->setColor(state.coluRegs[2]);
myPF[2]->setBackgroundColor(pfx_bgcolor);
myPF[2]->setIntState(state.pf[2], true); // reverse bit order myPF[2]->setIntState(state.pf[2], true); // reverse bit order
// Reflect // Reflect