From 60322a10d4a961b2f4b1a96f3bd46239ff09d81c Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Tue, 4 Apr 2017 18:19:11 -0230 Subject: [PATCH] The PF register in the debugger no longer shows COLUBK. Some minor rearranging of the 'queued writes' widget. --- src/debugger/gui/DelayQueueWidget.cxx | 2 +- src/debugger/gui/TiaWidget.cxx | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/debugger/gui/DelayQueueWidget.cxx b/src/debugger/gui/DelayQueueWidget.cxx index 2658405a8..f1c266a3e 100644 --- a/src/debugger/gui/DelayQueueWidget.cxx +++ b/src/debugger/gui/DelayQueueWidget.cxx @@ -31,7 +31,7 @@ DelayQueueWidget::DelayQueueWidget( { _textcolor = kTextColor; - _w = 300; + _w = 20 * font.getMaxCharWidth() + 6; _h = 3 * font.getLineHeight() + 6; myLines[0] = myLines[1] = myLines[2]; diff --git a/src/debugger/gui/TiaWidget.cxx b/src/debugger/gui/TiaWidget.cxx index 9a298514d..6da14362f 100644 --- a/src/debugger/gui/TiaWidget.cxx +++ b/src/debugger/gui/TiaWidget.cxx @@ -525,11 +525,10 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont, xpos = 10; 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); - ypos += 1.3*lineHeight; - xpos = 10; + xpos += t->getWidth() + 10; myDelayQueueWidget = new DelayQueueWidget(boss, lfont, xpos, ypos); // How to handle undriven pins @@ -888,20 +887,16 @@ void TiaWidget::loadConfig() //////////////////////////// // PF register info //////////////////////////// - int pfx_bgcolor = !tia.priorityPF() ? state.coluRegs[3] : -1; // PF0 myPF[0]->setColor(state.coluRegs[2]); - myPF[0]->setBackgroundColor(pfx_bgcolor); myPF[0]->setIntState(state.pf[0], true); // reverse bit order // PF1 myPF[1]->setColor(state.coluRegs[2]); - myPF[1]->setBackgroundColor(pfx_bgcolor); myPF[1]->setIntState(state.pf[1], false); // PF2 myPF[2]->setColor(state.coluRegs[2]); - myPF[2]->setBackgroundColor(pfx_bgcolor); myPF[2]->setIntState(state.pf[2], true); // reverse bit order // Reflect